Another fix/hack for https://github.com/TeamMentor/Master/issues/833