backporting fix