diff --git a/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs b/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs
index 1f3251fd2..10435130b 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/CopyPropagation.cs
@@ -87,7 +87,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 							block.Instructions[i] = copiedExpr;
 						}
 					}
-					else if (v.IsSingleDefinition && CanPerformCopyPropagation(v, copiedExpr, splitVariables))
+					else if (v.IsSingleDefinition && CanPerformCopyPropagation(v, copiedExpr, splitVariables, context.Settings))
 					{
 						DoPropagate(v, copiedExpr, block, ref i, context);
 					}
@@ -95,7 +95,7 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 			}
 		}
 
-		static bool CanPerformCopyPropagation(ILVariable target, ILInstruction value, HashSet<ILVariable> splitVariables)
+		static bool CanPerformCopyPropagation(ILVariable target, ILInstruction value, HashSet<ILVariable> splitVariables, DecompilerSettings settings)
 		{
 			Debug.Assert(target.StackType == value.ResultType);
 			if (target.Type.IsSmallIntegerType())
@@ -107,14 +107,15 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 			switch (value.OpCode)
 			{
 				case OpCode.LdLoca:
-				//				case OpCode.LdElema:
-				//				case OpCode.LdFlda:
 				case OpCode.LdsFlda:
 					// All address-loading instructions always return the same value for a given operand/argument combination,
 					// so they can be safely copied.
 					// ... except for LdElema and LdFlda, because those might throw an exception, and we don't want to
 					// change the place where the exception is thrown.
 					return true;
+				case OpCode.LdElema:
+				case OpCode.LdFlda:
+					return !settings.UseRefLocalsForAccurateOrderOfEvaluation;
 				case OpCode.LdLoc:
 					var v = ((LdLoc)value).Variable;
 					if (splitVariables != null && splitVariables.Contains(v))