Fixing issue_147

Fixing Issue 147 https://github.com/TeamMentor/Dev/issues/147