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

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