Fixed problems introduced by rebase