Fixing Issue https://github.com/TeamMentor/Master/issues/826