Fix to bug 464