diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java b/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
index 0bd3aa6b32..e1e42fe219 100644
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
@@ -143,7 +143,8 @@ public class EntityIO{
                 if(sl) cont("if(!islocal)");
 
                 if(sf){
-                    st(field.name + lastSuf + " = this." + field.name);
+                    //TODO + targetSuf may not give the right result, test it
+                    st(field.name + lastSuf + " = this." + field.name + targetSuf);
                 }
 
                 io(field.type, "this." + (sf ? field.name + targetSuf : field.name) + " = ");
diff --git a/gradle.properties b/gradle.properties
index cf506d1790..315e45532f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,4 +9,4 @@ kapt.use.worker.api=true
 kapt.include.compile.classpath=false
 # I don't need to use the kotlin stdlib yet, so remove it to prevent extra bloat & method count issues
 kotlin.stdlib.default.dependency=false
-archash=759b136340ea98d4cb9881e340fb219c6d602a66
+archash=ab7ff4172126f1b2db05b4620b3b7097aefd01b4