Fixing Exam bug