Fixed backported logic.