Issue 592

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