Fix for bug 924479