2 files changed, 11 insertions, 5 deletions
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java b/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
index be2bf1c..6d237b4 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/ColumnImpl.java
@@ -1990,7 +1990,7 @@ public class ColumnImpl implements Column, Comparable<ColumnImpl> {
       return ((value instanceof Double) ? value :
               toNumber(value, db).doubleValue());
     case SHORT_DATE_TIME:
-      return ((value instanceof DateExt) ? value :
+      return ((value instanceof Date) ? value :
               new Date(toDateLong(value)));
     case TEXT:
     case MEMO:
diff --git a/src/main/java/com/healthmarketscience/jackcess/impl/DBEvalContext.java b/src/main/java/com/healthmarketscience/jackcess/impl/DBEvalContext.java
index 398d9fa..7f50f68 100644
--- a/src/main/java/com/healthmarketscience/jackcess/impl/DBEvalContext.java
+++ b/src/main/java/com/healthmarketscience/jackcess/impl/DBEvalContext.java
@@ -49,8 +49,7 @@ public class DBEvalContext implements Expressionator.ParseContext, EvalConfig
   private final RandomContext _rndCtx = new RandomContext();
   private Bindings _bindings = new SimpleBindings();
 
-  public DBEvalContext(DatabaseImpl db)
-  {
+  public DBEvalContext(DatabaseImpl db) {
     _db = db;
   }
 
@@ -63,7 +62,10 @@ public class DBEvalContext implements Expressionator.ParseContext, EvalConfig
   }
 
   public void setTemporalConfig(TemporalConfig temporal) {
-    _temporal = temporal;
+    if(_temporal != temporal) {
+      _temporal = temporal;
+      _sdfs = null;
+    }
   }
 
   public Calendar getCalendar() {
@@ -75,7 +77,10 @@ public class DBEvalContext implements Expressionator.ParseContext, EvalConfig
   }
 
   public void setNumericConfig(NumericConfig numeric) {
-    _numeric = numeric;
+    if(_numeric != numeric) {
+      _numeric = numeric;
+      _dfs = null;
+    }
   }
 
   public FunctionLookup getFunctionLookup() {
@@ -101,6 +106,7 @@ public class DBEvalContext implements Expressionator.ParseContext, EvalConfig
     SimpleDateFormat sdf = _sdfs.get(formatStr);
     if(sdf == null) {
       sdf = _db.createDateFormat(formatStr);
+      sdf.setDateFormatSymbols(_temporal.getDateFormatSymbols());
       _sdfs.put(formatStr, sdf);
     }
     return sdf;