Patch to fix bug 924792