diff --git a/src/main/java/dk/camelot64/kickc/passes/PassNAddNumberTypeConversions.java b/src/main/java/dk/camelot64/kickc/passes/PassNAddNumberTypeConversions.java
index bd04e030f..7f05fe4f3 100644
--- a/src/main/java/dk/camelot64/kickc/passes/PassNAddNumberTypeConversions.java
+++ b/src/main/java/dk/camelot64/kickc/passes/PassNAddNumberTypeConversions.java
@@ -6,7 +6,6 @@ import dk.camelot64.kickc.model.iterator.ProgramExpressionIterator;
 import dk.camelot64.kickc.model.types.SymbolType;
 import dk.camelot64.kickc.model.types.SymbolTypeConversion;
 import dk.camelot64.kickc.model.types.SymbolTypeInference;
-import dk.camelot64.kickc.model.types.SymbolTypeIntegerFixed;
 import dk.camelot64.kickc.model.values.RValue;
 
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -28,35 +27,21 @@ public class PassNAddNumberTypeConversions extends Pass2SsaOptimization {
             ProgramExpressionBinary binary = (ProgramExpressionBinary) binaryExpression;
             RValue left = binary.getLeft();
             RValue right = binary.getRight();
-
-            // for simple assignments the right-hand-side is converted to the type of the left-hand side (6.5.16.1.2)
-            if(binary instanceof ProgramExpressionBinary.ProgramExpressionBinaryAssignmentLValue ||
-                  binary instanceof ProgramExpressionBinary.ProgramExpressionBinaryAssignmentRValue)
-            {
+            SymbolType castType = SymbolTypeConversion.getNumberCastType(left, right, getScope(), currentStmt);
+            if(castType != null) {
+               // Convert both left and right to the found type
                SymbolType leftType = SymbolTypeInference.inferType(getProgram().getScope(), left);
-               SymbolType rightType = SymbolTypeInference.inferType(getProgram().getScope(), right);
-               if (leftType instanceof SymbolTypeIntegerFixed && SymbolType.NUMBER.equals(rightType))
-               {
-                  getLog().append("Adding cast to assignment (" + leftType + ") " + binary.getRight().toString() + " in " + ((currentStmt == null) ? "" : currentStmt.toString(getProgram(), false)));
-                  binary.addRightCast(leftType, stmtIt, currentBlock == null ? null : currentBlock.getScope(), getScope());
+               if(SymbolType.NUMBER.equals(leftType)) {
+                  getLog().append("Adding number conversion cast (" + castType + ") " + binary.getLeft().toString() + " in " + (currentStmt==null?"":currentStmt.toString(getProgram(), false)));
+                  binary.addLeftCast(castType, stmtIt, currentBlock==null?null:currentBlock.getScope(), getScope());
                   modified.set(true);
                }
-            } else {
-              SymbolType castType = SymbolTypeConversion.getNumberCastType(left, right, getScope(), currentStmt);
-              if(castType != null) {
-                  // Convert both left and right to the found type
-                  SymbolType leftType = SymbolTypeInference.inferType(getProgram().getScope(), left);
-                  if(SymbolType.NUMBER.equals(leftType)) {
-                     getLog().append("Adding number conversion cast (" + castType + ") " + binary.getLeft().toString() + " in " + (currentStmt==null?"":currentStmt.toString(getProgram(), false)));
-                     binary.addLeftCast(castType, stmtIt, currentBlock==null?null:currentBlock.getScope(), getScope());
-                     modified.set(true);
-                  }
-                  SymbolType rightType = SymbolTypeInference.inferType(getProgram().getScope(), right);
-                  if(SymbolType.NUMBER.equals(rightType)) {
-                     getLog().append("Adding number conversion cast (" + castType + ") " + binary.getRight().toString() + " in " + ((currentStmt==null)?"":currentStmt.toString(getProgram(), false)));
-                     binary.addRightCast(castType, stmtIt, currentBlock==null?null:currentBlock.getScope(), getScope());
-                     modified.set(true);
-                  }
+               SymbolType rightType = SymbolTypeInference.inferType(getProgram().getScope(), right);
+               if(SymbolType.NUMBER.equals(rightType)) {
+                  getLog().append("Adding number conversion cast (" + castType + ") " + binary.getRight().toString() + " in " + ((currentStmt==null)?"":currentStmt.toString(getProgram(), false)));
+                  binary.addRightCast(castType, stmtIt, currentBlock==null?null:currentBlock.getScope(), getScope());
+
+                  modified.set(true);
                }
             }
          }