Fix for bug 1025218