Fixing Issue 565 https://github.com/TeamMentor/Master/issues/565

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