Refix patch lost in rebase