fixed up branching