fix post-rebase param bugs