diff --git a/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java b/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java
index 2156ba8f9..1370ecb10 100644
--- a/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java
+++ b/jadx-core/src/main/java/jadx/core/codegen/TypeGen.java
@@ -65,11 +65,11 @@ public class TypeGen {
 				}
 				return stringUtils.unescapeChar(ch);
 			case BYTE:
-				return formatByte((byte) lit);
+				return formatByte(lit);
 			case SHORT:
-				return formatShort((short) lit);
+				return formatShort(lit);
 			case INT:
-				return formatInteger((int) lit);
+				return formatInteger(lit);
 			case LONG:
 				return formatLong(lit);
 			case FLOAT:
@@ -90,34 +90,34 @@ public class TypeGen {
 		}
 	}
 
-	public static String formatShort(short s) {
-		if (s == Short.MAX_VALUE) {
+	public static String formatShort(long l) {
+		if (l == Short.MAX_VALUE) {
 			return "Short.MAX_VALUE";
 		}
-		if (s == Short.MIN_VALUE) {
+		if (l == Short.MIN_VALUE) {
 			return "Short.MIN_VALUE";
 		}
-		return Short.toString(s);
+		return Long.toString(l);
 	}
 
-	public static String formatByte(byte b) {
-		if (b == Byte.MAX_VALUE) {
+	public static String formatByte(long l) {
+		if (l == Byte.MAX_VALUE) {
 			return "Byte.MAX_VALUE";
 		}
-		if (b == Byte.MIN_VALUE) {
+		if (l == Byte.MIN_VALUE) {
 			return "Byte.MIN_VALUE";
 		}
-		return Byte.toString(b);
+		return Long.toString(l);
 	}
 
-	public static String formatInteger(int i) {
-		if (i == Integer.MAX_VALUE) {
+	public static String formatInteger(long l) {
+		if (l == Integer.MAX_VALUE) {
 			return "Integer.MAX_VALUE";
 		}
-		if (i == Integer.MIN_VALUE) {
+		if (l == Integer.MIN_VALUE) {
 			return "Integer.MIN_VALUE";
 		}
-		return Integer.toString(i);
+		return Long.toString(l);
 	}
 
 	public static String formatLong(long l) {
diff --git a/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver9.java b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver9.java
new file mode 100644
index 000000000..42eb1b326
--- /dev/null
+++ b/jadx-core/src/test/java/jadx/tests/integration/types/TestTypeResolver9.java
@@ -0,0 +1,39 @@
+package jadx.tests.integration.types;
+
+import org.junit.jupiter.api.Test;
+
+import jadx.core.dex.nodes.ClassNode;
+import jadx.tests.api.IntegrationTest;
+
+import static jadx.tests.api.utils.JadxMatchers.containsOne;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
+
+public class TestTypeResolver9 extends IntegrationTest {
+
+	public static class TestCls {
+		public int test(byte b) {
+			return 16777216 * b;
+		}
+
+		public int test2(byte[] array, int offset) {
+			return (array[offset] * 128) + (array[offset + 1] & 0xFF);
+		}
+	}
+
+	@Test
+	public void test() {
+		ClassNode cls = getClassNode(TestCls.class);
+		String code = cls.getCode().toString();
+
+		assertThat(code, containsOne("return 16777216 * b;"));
+		assertThat(code, not(containsString("Byte.MIN_VALUE")));
+	}
+
+	@Test
+	public void testNoDebug() {
+		noDebugInfo();
+		getClassNode(TestCls.class);
+	}
+}