Fix for https://github.com/TeamMentor/Master/issues/25
Fix for https://github.com/TeamMentor/Master/issues/823