QUIZ-50

this fixes QUIZ-50 (and QUIZ-57)