Choice Conundrums fix