Fixing wrong branching - 2