Bugfix3118 2.4

Fix for bug 3118 against branch 2.4