fix new branch crash