Back to bug 636