Fixing Issue 474

Fixing Issue 474 https://github.com/TeamMentor/Master/issues/474