Proposed solution to bug 823385