diff --git a/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25.java b/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25.java
index 1aa9697..ba4960c 100644
--- a/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25.java
+++ b/src/main/java/com/flowingcode/vaadin/jsonmigration/JsonMigrationHelper25.java
@@ -74,8 +74,8 @@ private static JsonValue convertToJsonValue(JsonNode jsonNode) {
     switch (jsonNode.getNodeType()) {
       case OBJECT:
         JsonObject jsonObject = Json.createObject();
-        JsonObject source = (JsonObject)jsonNode; 
-        for (String key : source.keys()) {
+        ObjectNode source = (ObjectNode) jsonNode;
+        for (String key : source.propertyNames()) {
           jsonObject.put(key, convertToJsonValue(source.get(key)));
         }
         return jsonObject;