diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java
index 95fa261..266cd4f 100644
--- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java
+++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java
@@ -169,7 +169,7 @@ public class GenUpgraderBaseX extends ClassGenerator {
 						var upgraderClass = ClassName.bestGuess(upgradeDataConfiguration.upgrader);
 						var cb = CodeBlock.builder();
 						var newFieldType = Objects
-								.requireNonNull(dataModel.getComputedTypes(version).get(fixType(upgradeDataConfiguration.type)));
+								.requireNonNull(dataModel.getComputedTypes(nextTypeBase.getVersion()).get(fixType(upgradeDataConfiguration.type)));
 						var genericUpgraderClass = ParameterizedTypeName.get(ClassName.get(DataUpgrader.class),
 								fieldType.getJTypeName(basePackageName).box(),
 								newFieldType.getJTypeName(basePackageName).box()