Fixing Issue 445 -https://github.com/TeamMentor/Master/issues/455

Fixing Issue 445 -https://github.com/TeamMentor/Master/issues/455