Rebase issue, fixed