backported fix