Fixing Issue_504

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