Fixing Issue 123 https://github.com/TeamMentor/TM_4_0_Design/issues/123