Issue 589

Fixes https://github.com/TeamMentor/Master/issues/589