Add fix to bug introduced by test