Fixing Issue_475

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