Resolve bug from rebase