Fixing Issue_459

https://github.com/TeamMentor/Master/issues/478
https://github.com/TeamMentor/Master/issues/459