Fix for bug 1039151