Fix for bug 1024493