Fix for bug 1024669