fixing bug #4417
Fix merge conflict with the fix of the bug 4417