diff --git a/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs b/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs
index b3d3fe8ce..972be8aa0 100644
--- a/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs
+++ b/ICSharpCode.Decompiler/IL/Instructions/CompoundAssignmentInstruction.cs
@@ -97,6 +97,7 @@ namespace ICSharpCode.Decompiler.IL
 			this.AddILRange(binary);
 			Debug.Assert(compoundAssignmentType == CompoundAssignmentType.EvaluatesToNewValue || (Operator == BinaryNumericOperator.Add || Operator == BinaryNumericOperator.Sub));
 			Debug.Assert(IsValidCompoundAssignmentTarget(Target));
+			Debug.Assert(this.ResultType == (IsLifted ? StackType.O : UnderlyingResultType));
 		}
 		
 		/// <summary>
diff --git a/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs b/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs
index 1f337c420..f7a6bee67 100644
--- a/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs
+++ b/ICSharpCode.Decompiler/IL/Transforms/TransformAssignment.cs
@@ -478,9 +478,17 @@ namespace ICSharpCode.Decompiler.IL.Transforms
 				// Try to determine the real type of the object we're modifying:
 				storeType = stobj.Target.InferType(compilation);
 				if (storeType is ByReferenceType refType) {
-					storeType = refType.ElementType;
+					if (TypeUtils.IsCompatibleTypeForMemoryAccess(refType.ElementType, stobj.Type)) {
+						storeType = refType.ElementType;
+					} else {
+						storeType = stobj.Type;
+					}
 				} else if (storeType is PointerType pointerType) {
-					storeType = pointerType.ElementType;
+					if (TypeUtils.IsCompatibleTypeForMemoryAccess(pointerType.ElementType, stobj.Type)) {
+						storeType = pointerType.ElementType;
+					} else {
+						storeType = stobj.Type;
+					}
 				} else {
 					storeType = stobj.Type;
 				}