rebase issue 2