Fixed scope issues with quiz mode