ConfusingConditionCheck fix2