Fixing Issue_857

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