minor bug introduced in rebase