Single Choice wrapper fix