diff --git a/doc/Analyzing.markdown b/doc/Analyzing.markdown
index dc6684f..b444825 100644
--- a/doc/Analyzing.markdown
+++ b/doc/Analyzing.markdown
@@ -265,7 +265,7 @@ Some more tests...
     = main ([])
     =   A: PoisonedWith (Immediate 4)
     =   Y: UpdatedWith (Immediate 0)
-    =   IndirectIndexed (NamedLocation (Just Word) "position") Y: UpdatedWith A
+    =   IndirectIndexed (NamedLocation Nothing "position") Y: UpdatedWith A
     =   NamedLocation Nothing "position": PoisonedWith A
     =   NamedLocation Nothing "value": UpdatedWith (Immediate 1)
     = 
diff --git a/src/SixtyPical/Context.hs b/src/SixtyPical/Context.hs
index 6f7aae2..9453d0e 100644
--- a/src/SixtyPical/Context.hs
+++ b/src/SixtyPical/Context.hs
@@ -32,6 +32,8 @@ untypedLocation (LowByteOf x) =
     untypedLocation x
 untypedLocation (Indexed table index) =
     untypedLocation table
+untypedLocation (IndirectIndexed word index) =
+    IndirectIndexed (untypedLocation word) index
 untypedLocation (NamedLocation _ name) =
     NamedLocation Nothing name
 untypedLocation x = x