Fixing Issue_407

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