Fixing wrong branching - 3