diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index e2dd23552..3d87b007d 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -828,7 +828,7 @@ class StudentWorkController < ApplicationController
     if User.current.admin?
       @new_score.reviewer_role = 1
     else
-      role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name
+      role = User.current.members.where("course_id = ?",@course.id).first.roles.where("is_current = 1").first.name
       @new_score.reviewer_role = get_role_by_name(role)
     end
     if @score