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