Fixing Issue_458

Hi There.
I'm adding this pull request to address https://github.com/TeamMentor/Master/issues/458