Fix for https://github.com/TeamMentor/Master/issues/840