Fixing Issue 517

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