bug fix after rebase