Possible solution to bug 823385