Fixed the instructor part for issue #128. This merge request partially fixed the issue. In collaboration with @emmet0r.