Try to fix bug 13981