Fixing Issue_400

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