fix bug from rebase