CONN-478:Fix Condition to meet requirements