Fixing Issue_527

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