rebase of bug