diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/TernarOpItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/TernarOpItem.java
index 9a2042904..06f1c9e4b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/TernarOpItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/TernarOpItem.java
@@ -23,6 +23,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.SourceGenerator;
+import com.jpexs.decompiler.graph.TypeItem;
 import java.util.List;
 import java.util.Objects;
 
@@ -94,7 +95,14 @@ public class TernarOpItem extends GraphTargetItem {
 
     @Override
     public GraphTargetItem returnType() {
-        return onTrue.returnType();
+        if (onTrue.returnType().equals(onFalse.returnType())) {
+            return onTrue.returnType();
+        }
+        if ((onTrue.returnType().equals(TypeItem.NUMBER) || onTrue.returnType().equals(TypeItem.INT) || onTrue.returnType().equals(TypeItem.UINT))
+                && (onFalse.returnType().equals(TypeItem.NUMBER) || onFalse.returnType().equals(TypeItem.INT) || onFalse.returnType().equals(TypeItem.UINT))) {
+            return TypeItem.NUMBER;
+        }
+        return TypeItem.UNBOUNDED;
     }
 
     @Override
diff --git a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf
index 24d0585de..5f084737e 100644
Binary files a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf and b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.air.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf
index ddefa4b53..218c28cf7 100644
Binary files a/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf and b/libsrc/ffdec_lib/testdata/as3_new/bin/as3_new.flex.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestConvert.as b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestConvert.as
index 5db7b50b6..f0b036b8d 100644
--- a/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestConvert.as
+++ b/libsrc/ffdec_lib/testdata/as3_new/src/tests/TestConvert.as
@@ -13,6 +13,9 @@ package tests
             var j:int = n;
             s = String(j);
             s = ns;
+            
+            s = String((i == 4) ? "" : i);
+            s = (i == 4) ? "" : String(i);
 		}
 	}
 }