diff --git a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartBlockProperties.java b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartBlockProperties.java
index c5410de..250c3a8 100644
--- a/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartBlockProperties.java
+++ b/src/main/java/implementslegend/mod/vaultfaster/mixin/MixinPartBlockProperties.java
@@ -4,7 +4,9 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -15,8 +17,24 @@
 @Mixin(PartialBlockProperties.class)
 public class MixinPartBlockProperties  {
 
+    private static final HashMap ANTIALLOCATION = new HashMap();
+
+    @Redirect(method = "empty", at = @At(value = "NEW", target = "()Ljava/util/HashMap;"), remap = false)
+    private static HashMap useLinkedHashMap(){
+        return ANTIALLOCATION;
+    }
+    @Redirect(method = "of(Lnet/minecraft/world/level/block/state/BlockState;)Liskallia/vault/core/world/data/tile/PartialBlockProperties;", at = @At(value = "NEW", target = "()Ljava/util/HashMap;"), remap = false)
+    private static HashMap useLinkedHashMap2(){
+        return ANTIALLOCATION;
+    }
+
+
     @ModifyVariable(method = "<init>", at = @At(value = "HEAD"), argsOnly = true)
     private static Map useLinkedHashMap(Map values){
+        return (values instanceof LinkedHashMap<?,?>)?values:new LinkedHashMap<String,String>(values);
+    }
+    @ModifyVariable(method = "of(Lnet/minecraft/world/level/block/state/BlockState;)Liskallia/vault/core/world/data/tile/PartialBlockProperties;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getProperties()Ljava/util/Collection;"), argsOnly = false)
+    private static Map useLinkedHashMap2(Map values){
         return new LinkedHashMap<String,String>(values);
     }
 }