Fix for bug 990927