Backported fix