diff --git a/liberty/TableModel.cc b/liberty/TableModel.cc
index c3e8856f..3bda98e3 100644
--- a/liberty/TableModel.cc
+++ b/liberty/TableModel.cc
@@ -116,9 +116,9 @@ GateTableModel::gateDelay(const Pvt *pvt,
     drvr_slew = findValue(pvt, slew_models_->model(), in_slew, load_cap, 0.0);
   else
     drvr_slew = 0.0;
-  // Clip negative delays and slews to zero.
-  if (gate_delay < 0.0)
-    gate_delay = 0.0;
+  // TODO: Check for a better solution than clip negative delays and slews to zero.
+  //if (gate_delay < 0.0)
+  //  gate_delay = 0.0;
   if (drvr_slew < 0.0)
     drvr_slew = 0.0;
 }