Fixing the branch problem