fix a type in rebase1