Fix to bug introduced by previous commit