Fixing Issue 534

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