Fixing Issue_458

Pushing issue 458 into master https://github.com/TeamMentor/Master/issues/458