Fix for bug 977224