Fixing Issue_193

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