fix crash in rewrite_branch()