diff --git a/build.gradle.kts b/build.gradle.kts
index 5df688e..f492b8e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ repositories {
     mavenCentral()
 }
 
-version = "1.3.0-SNAPSHOT"
+version = "1.3.1-SNAPSHOT"
 group = "org.hisp.dhis.lib.expression"
 
 if (project.hasProperty("removeSnapshotSuffix")) {
diff --git a/src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt b/src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt
index b2db5a8..934fd18 100644
--- a/src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt
+++ b/src/commonMain/kotlin/org/hisp/dhis/lib/expression/eval/Calculator.kt
@@ -76,6 +76,10 @@ internal class Calculator(
                 evalToNumber(fn.child(1)))
             NamedFunction.d2_ceil -> functions.d2_ceil(evalToNumber(fn.child(0)))
             NamedFunction.d2_concatenate -> functions.d2_concatenate(evalToStrings(fn.children()))
+            NamedFunction.d2_condition -> functions.ifThenElse(
+                evalToBoolean(fn.child(0)),
+                evalToMixed(fn.child(1)),
+                evalToMixed(fn.child(2)))
             NamedFunction.d2_contains -> functions.contains(evalToString(fn.child(0)), evalToStrings(fn.children()).drop(1))
             NamedFunction.d2_containsItems -> functions.containsItems(evalToString(fn.child(0)), evalToStrings(fn.children()).drop(1))
             NamedFunction.d2_count -> functions.d2_count(evalToVar(fn.child(0)))