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