Fix CorrectAnswer selection