diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java
index c00a2c85..09b7daf7 100644
--- a/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java
@@ -98,7 +98,6 @@ public class ForgeRegistryMixin<V extends IForgeRegistryEntry<V>> {
         this.fastRegistry.optimize();
     }
 
-    /*
     @Redirect(method = "sync", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/BiMap;clear()V"))
     private void clearBiMap(BiMap map) {
         if(map == this.owners) {
@@ -108,6 +107,4 @@ public class ForgeRegistryMixin<V extends IForgeRegistryEntry<V>> {
         } else
             map.clear();
     }
-
-     */
 }
diff --git a/src/main/java/org/embeddedt/modernfix/registry/FastForgeRegistry.java b/src/main/java/org/embeddedt/modernfix/registry/FastForgeRegistry.java
index ecee2a18..673cec5e 100644
--- a/src/main/java/org/embeddedt/modernfix/registry/FastForgeRegistry.java
+++ b/src/main/java/org/embeddedt/modernfix/registry/FastForgeRegistry.java
@@ -18,14 +18,14 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class FastForgeRegistry<V extends IForgeRegistryEntry<V>> {
-    private BiMap<Integer, V> ids;
-    private DataFieldBiMap<ResourceLocation> names;
-    private DataFieldBiMap<ResourceKey<V>> keys;
-    private DataFieldBiMap<?> owners;
-    private ResourceKey<Registry<V>> registryKey;
+    private final BiMap<Integer, V> ids;
+    private final DataFieldBiMap<ResourceLocation> names;
+    private final DataFieldBiMap<ResourceKey<V>> keys;
+    private final DataFieldBiMap<?> owners;
+    private final ResourceKey<Registry<V>> registryKey;
 
-    private ObjectArrayList<V> valuesById;
-    private Object2ObjectOpenHashMap<V, RegistryValueData> infoByValue;
+    private final ObjectArrayList<V> valuesById;
+    private final Object2ObjectOpenHashMap<V, RegistryValueData> infoByValue;
 
     private void storeId(V value, int id) {
         RegistryValueData pair = infoByValue.computeIfAbsent(value, k -> new RegistryValueData());
@@ -58,6 +58,7 @@ public class FastForgeRegistry<V extends IForgeRegistryEntry<V>> {
         }
         this.names.clearUnsafe();
         this.keys.clearUnsafe();
+        this.owners.clearUnsafe();
     }
 
     public FastForgeRegistry(ResourceKey<Registry<V>> registryKey) {