Issue 458

Fixing Issue_458 https://github.com/TeamMentor/Master/issues/458