diff --git a/api/src/main/java/org/openmrs/module/reporting/dataset/definition/evaluator/PatientDataSetEvaluator.java b/api/src/main/java/org/openmrs/module/reporting/dataset/definition/evaluator/PatientDataSetEvaluator.java
index 5a561e370..62e35d90c 100644
--- a/api/src/main/java/org/openmrs/module/reporting/dataset/definition/evaluator/PatientDataSetEvaluator.java
+++ b/api/src/main/java/org/openmrs/module/reporting/dataset/definition/evaluator/PatientDataSetEvaluator.java
@@ -90,6 +90,7 @@ public DataSet evaluate(DataSetDefinition dataSetDefinition, EvaluationContext c
 			StopWatch sw = new StopWatch();
 			sw.start();
 
+			ec.addContextValue("columnDefinitions", cd);
 			MappedData<? extends PatientDataDefinition> dataDef = (MappedData<? extends PatientDataDefinition>) cd.getDataDefinition();
 			EvaluatedPatientData data = Context.getService(PatientDataService.class).evaluate(dataDef, ec);