Fixing issue_853

Fixing Issue https://github.com/TeamMentor/Master/issues/853. This needs to be merged into 3.4.3 because that is the current PoC version for GE.

This change will also be applied in TM3.5