* An attempt to fix bug 11119