Back to bug 249