Fix for bug 1038730