Issue 588

To fix issue https://github.com/TeamMentor/Master/issues/588