diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
index 544d8433e..42c9e2ded 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
@@ -43,6 +43,7 @@ import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.*;
 import java.util.*;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -281,8 +282,11 @@ public final class DefaultTypeManager implements TypeManager {
   }
 
   private ScalarType<?> checkInterfaceTypes(Class<?> type) {
-    if (java.nio.file.Path.class.isAssignableFrom(type)) {
-      return typeMap.get(java.nio.file.Path.class);
+    for (Entry<Class<?>, ScalarType<?>> entry : typeMap.entrySet()) {
+      if (entry.getKey().isAssignableFrom(type)) {
+        typeMap.put(type, entry.getValue());
+        return entry.getValue();
+      }
     }
     return null;
   }