Another wild guess to see if we can fix bug 681138