diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/indicators.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/indicators.kt
index c9e758711..d992296f4 100644
--- a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/indicators.kt
+++ b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/ast/indicators.kt
@@ -42,35 +42,35 @@ typealias IndicatorKey = Int
  * */
 enum class IndicatorType(val range: IntRange) {
     Predefined(1..99),
-    KA(1..1),
-    KB(2..2),
-    KC(3..3),
-    KD(4..4),
-    KE(5..5),
-    KF(6..6),
-    KG(7..7),
-    KH(8..8),
-    KI(9..9),
-    KJ(10..10),
-    KK(11..11),
-    KL(12..12),
-    KM(13..13),
-    KN(14..14),
-    KP(15..15),
-    KQ(16..16),
-    KR(17..17),
-    KS(18..18),
-    KT(19..19),
-    KU(20..20),
-    KV(21..21),
-    KW(22..22),
-    KX(23..23),
-    KY(24..24),
     LR(100..100),
     RT(101..101),
     OC(102..102),
     OF(103..103),
     OV(104..104),
+    KA(105..105),
+    KB(106..106),
+    KC(107..107),
+    KD(108..108),
+    KE(109..109),
+    KF(110..110),
+    KG(111..111),
+    KH(112..112),
+    KI(113..113),
+    KJ(114..114),
+    KK(115..115),
+    KL(116..116),
+    KM(117..117),
+    KN(118..118),
+    KP(119..119),
+    KQ(120..120),
+    KR(121..121),
+    KS(122..122),
+    KT(123..123),
+    KU(124..124),
+    KV(125..125),
+    KW(126..126),
+    KX(127..127),
+    KY(128..128),
     ;
 
     companion object {
diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/parsetreetoast/misc.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/parsetreetoast/misc.kt
index 1657ca755..1c5215fa0 100644
--- a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/parsetreetoast/misc.kt
+++ b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/parsetreetoast/misc.kt
@@ -955,8 +955,8 @@ private fun annidatedReferenceExpression(
         }
     }
     if (text.uppercase(Locale.getDefault()).startsWith("*IN")) {
-        val index = text.uppercase(Locale.getDefault()).removePrefix("*IN").toInt()
-        return IndicatorExpr(index, position)
+        val index = text.uppercase(Locale.getDefault()).removePrefix("*IN")
+        return IndicatorExpr(index.toIndicatorKey(), position)
     }
 
     var expr: Expression