Fixing Issue_384 https://github.com/TeamMentor/Master/issues/384