Bug 2003 fixed

Do not report this fix on master.
It is incorporated in another PR dedicated to master...