Fixing Issue_462

https://github.com/TeamMentor/Master/issues/462