diff --git a/Assets/Mirror/Weaver/Processors/SyncVarProcessor.cs b/Assets/Mirror/Weaver/Processors/SyncVarProcessor.cs
index 0fa0ba53a..6951bb3d5 100644
--- a/Assets/Mirror/Weaver/Processors/SyncVarProcessor.cs
+++ b/Assets/Mirror/Weaver/Processors/SyncVarProcessor.cs
@@ -159,7 +159,6 @@ public static void ProcessSyncVar(TypeDefinition td, FieldDefinition fd, List<Fi
         {
             string originalName = fd.Name;
 
-            Weaver.lists.replacedFields.Add(fd);
             Weaver.DLog(td, "Sync Var " + fd.Name + " " + fd.FieldType + " " + Weaver.gameObjectType);
 
             // GameObject SyncVars have a new field for netId
@@ -188,7 +187,7 @@ public static void ProcessSyncVar(TypeDefinition td, FieldDefinition fd, List<Fi
             td.Methods.Add(get);
             td.Methods.Add(set);
             td.Properties.Add(propertyDefinition);
-            Weaver.lists.replacementProperties.Add(set);
+            Weaver.lists.replacementSetterProperties[fd] = set;
         }
 
         public static void ProcessSyncVars(TypeDefinition td, List<FieldDefinition> syncVars, List<FieldDefinition> syncObjects, List<FieldDefinition> syncVarNetIds)
diff --git a/Assets/Mirror/Weaver/Weaver.cs b/Assets/Mirror/Weaver/Weaver.cs
index de1584aa7..eb8581c14 100644
--- a/Assets/Mirror/Weaver/Weaver.cs
+++ b/Assets/Mirror/Weaver/Weaver.cs
@@ -13,10 +13,8 @@ namespace Mirror.Weaver
     // This data is flushed each time - if we are run multiple times in the same process/domain
     class WeaverLists
     {
-        // [SyncVar] member variables that should be replaced
-        public List<FieldDefinition> replacedFields = new List<FieldDefinition>();
-        // setter functions that replace [SyncVar] member variable references
-        public List<MethodDefinition> replacementProperties = new List<MethodDefinition>();
+        // setter functions that replace [SyncVar] member variable references. dict<field, replacement>
+        public Dictionary<FieldDefinition, MethodDefinition> replacementSetterProperties = new Dictionary<FieldDefinition, MethodDefinition>();
         // GameObject SyncVar generated netId fields
         public List<FieldDefinition> netIdFields = new List<FieldDefinition>();
 
@@ -751,18 +749,14 @@ static void ProcessInstructionSetterField(TypeDefinition td, MethodDefinition md
                 return;
 
             // does it set a field that we replaced?
-            for (int n = 0; n < lists.replacedFields.Count; n++)
+            MethodDefinition replacement;
+            if (lists.replacementSetterProperties.TryGetValue(opField, out replacement))
             {
-                FieldDefinition fd = lists.replacedFields[n];
-                if (opField == fd)
-                {
-                    //replace with property
-                    //DLog(td, "    replacing "  + md.Name + ":" + i);
-                    i.OpCode = OpCodes.Call;
-                    i.Operand = lists.replacementProperties[n];
-                    //DLog(td, "    replaced  "  + md.Name + ":" + i);
-                    break;
-                }
+                //replace with property
+                //DLog(td, "    replacing "  + md.Name + ":" + i);
+                i.OpCode = OpCodes.Call;
+                i.Operand = replacement;
+                //DLog(td, "    replaced  "  + md.Name + ":" + i);
             }
         }