Fix for Issue #398.

[TeamMentor/Dev#398](https://github.com/TeamMentor/Master/issues/398)