Fixing Issue_142

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