diff --git a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/common/JdtDataFlowModel.java b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/common/JdtDataFlowModel.java
index 8874006..9793225 100644
--- a/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/common/JdtDataFlowModel.java
+++ b/state_machine_exporter/src/main/java/click/kamil/springstatemachineexporter/ast/common/JdtDataFlowModel.java
@@ -316,10 +316,8 @@ public class JdtDataFlowModel implements DataFlowModel {
             Map<IVariableBinding, Expression> instanceFieldBindings) {
         Map<IVariableBinding, Expression> bindings = objectFieldBindings.get(cic);
         if (bindings == null) {
-            bindings = new HashMap<>();
+            bindings = buildFieldBindingsFromCic(cic, paramBindings, instanceFieldBindings);
             objectFieldBindings.put(cic, bindings);
-            Map<IVariableBinding, Expression> built = buildFieldBindingsFromCic(cic, paramBindings, instanceFieldBindings);
-            bindings.putAll(built);
         }
         return bindings;
     }
@@ -327,10 +325,8 @@ public class JdtDataFlowModel implements DataFlowModel {
     private Map<IVariableBinding, Expression> getOrCreateFieldBindings(ClassInstanceCreation cic) {
         Map<IVariableBinding, Expression> bindings = objectFieldBindings.get(cic);
         if (bindings == null) {
-            bindings = new HashMap<>();
+            bindings = buildFieldBindingsFromCic(cic);
             objectFieldBindings.put(cic, bindings);
-            Map<IVariableBinding, Expression> built = buildFieldBindingsFromCic(cic);
-            bindings.putAll(built);
         }
         return bindings;
     }