Issue 592

Fixing Issue_592 https://github.com/TeamMentor/Master/issues/592