diff --git a/storage/src/main/java/com/zfoo/storage/convert/ArrayConverter.java b/storage/src/main/java/com/zfoo/storage/convert/ArrayConverter.java
index 58e8787e..9ab110d7 100644
--- a/storage/src/main/java/com/zfoo/storage/convert/ArrayConverter.java
+++ b/storage/src/main/java/com/zfoo/storage/convert/ArrayConverter.java
@@ -29,7 +29,7 @@ public class ArrayConverter implements ConditionalGenericConverter {
 
     @Override
     public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-        return sourceType.getType() == String.class && targetType.getType().isArray();
+        return sourceType.getType() == String.class && targetType.isArray();
     }
 
     @Override
diff --git a/storage/src/main/java/com/zfoo/storage/convert/JsonToMapConverter.java b/storage/src/main/java/com/zfoo/storage/convert/JsonToMapConverter.java
index b0a41e69..2969b3e7 100644
--- a/storage/src/main/java/com/zfoo/storage/convert/JsonToMapConverter.java
+++ b/storage/src/main/java/com/zfoo/storage/convert/JsonToMapConverter.java
@@ -28,7 +28,7 @@ import java.util.Set;
 public class JsonToMapConverter implements ConditionalGenericConverter {
     @Override
     public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
-        return sourceType.getType() == String.class && Map.class.isAssignableFrom(targetType.getType());
+        return sourceType.getType() == String.class && targetType.isMap();
     }
 
     @Override