Back to bug 246