Correct conditional GOP switch