Fixing Issue 461

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