fix quiz bug
Merge branch 'feature-fixQuizBug' into develop