Fix for bug 1025033