Fixing Issue 692

Fixing https://github.com/TeamMentor/Master/issues/602