Fixing Issue_857

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