diff --git a/src/main/java/com/manticore/transpiler/ExpressionTranspiler.java b/src/main/java/com/manticore/transpiler/ExpressionTranspiler.java
index 9cf3a35..a1bc0c0 100644
--- a/src/main/java/com/manticore/transpiler/ExpressionTranspiler.java
+++ b/src/main/java/com/manticore/transpiler/ExpressionTranspiler.java
@@ -8,11 +8,11 @@
 
 public class ExpressionTranspiler extends ExpressionDeParser {
   public void visit(Function function) {
+    // @todo: figure out a better rewrite mechanism
     if (function.getName().equalsIgnoreCase("nvl")) {
       function.setName("Coalesce");
-    }
-
-    if (function.getName().equalsIgnoreCase("date")) {
+      super.visit(function);
+    } else if (function.getName().equalsIgnoreCase("date")) {
       ExpressionList<?> parameters = function.getParameters();
       final CastExpression expression;
       switch (parameters.size()) {
@@ -32,7 +32,5 @@ public void visit(Function function) {
           break;
       }
     }
-
-
   }
 }