=== modified file 'src/com/goldencode/p2j/ui/client/FillIn.java'
--- old/src/com/goldencode/p2j/ui/client/FillIn.java	2025-12-18 08:00:20 +0000
+++ new/src/com/goldencode/p2j/ui/client/FillIn.java	2026-01-23 11:54:40 +0000
@@ -705,9 +705,6 @@
    /** Hard format check state flag. */
    private boolean formatCheck = false;
    
-   /** Keep track if the fill-in is date based. */
-   protected boolean isDateBased = false;
-   
    /** The active scroller, used when the fill-in is editable. */
    protected EditScroller editScroller = null;
    
@@ -820,11 +817,6 @@
       disable();
 
       resetEditScroller();
-      
-      // check if fill-in is date based
-      isDateBased = config.dataType.equalsIgnoreCase("date")     ||
-                    config.dataType.equalsIgnoreCase("datetime") ||
-                    config.dataType.equalsIgnoreCase("datetime-tz");
    }
 
    /**
@@ -1519,6 +1511,7 @@
       final boolean isChui = ThinClient.getInstance().isChui();
       Presentation appDataPres = config.appDataPres;
          
+      final boolean isDateBased = isDateBased();
       if (Keyboard.isPrintableKey(ke)) // range for printable characters
       {
          if (config.readOnly)
@@ -3146,6 +3139,20 @@
    }
 
    /**
+    * Test if this FILL-IN data type is date/datetime/datetime-tz
+    * 
+    * @return see above
+    */
+   protected final boolean isDateBased()
+   {
+      return switch (config.dataType.toLowerCase())
+      {
+         case "date", "datetime", "datetime-tz" -> true;
+         default -> false;
+      };
+   }
+
+   /**
     * Synchronizes the actual size with the default size.
     */
    protected void updateSize()
@@ -3212,12 +3219,7 @@
 
       config.dataType = appVar.getTypeName();
       
-      // update flag value for date based fill-in
-      isDateBased = config.dataType.equalsIgnoreCase("date")     ||
-                    config.dataType.equalsIgnoreCase("datetime") ||
-                    config.dataType.equalsIgnoreCase("datetime-tz");
-      
-      if (isDateBased)
+      if (isDateBased())
       {
          updateFont();
       }

=== modified file 'src/com/goldencode/p2j/ui/client/gui/FillInGuiImpl.java'
--- old/src/com/goldencode/p2j/ui/client/gui/FillInGuiImpl.java	2025-12-18 08:00:20 +0000
+++ new/src/com/goldencode/p2j/ui/client/gui/FillInGuiImpl.java	2026-01-23 11:53:12 +0000
@@ -1263,6 +1263,7 @@
          final boolean isBkspOrShiftBksp =   actionCode == Keyboard.KA_BACKSPACE ||
                                              actionCode == Keyboard.KC_SHIFT_BACKSPACE ;
 
+         final boolean isDateBased = isDateBased();
          if (isBkspOrShiftBksp && isDateBased)
          {
             // Move cursor at the most left position of the selection