Correct when clause