Fixing Issue 808

Fixing issue https://github.com/TeamMentor/Master/issues/808