diff --git a/.pick_status.json b/.pick_status.json
index edde92aa197..1e726d5f479 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -324,7 +324,7 @@
         "description": "gfxstream: use `range` variable for its intended purpose",
         "nominated": false,
         "nomination_type": 0,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gfxstream/codegen/scripts/cereal/encoder.py b/src/gfxstream/codegen/scripts/cereal/encoder.py
index c181de79d7a..237947cf1ca 100644
--- a/src/gfxstream/codegen/scripts/cereal/encoder.py
+++ b/src/gfxstream/codegen/scripts/cereal/encoder.py
@@ -554,9 +554,9 @@ def encode_vkFlushMappedMemoryRanges(typeInfo, api, cgen):
         cgen.beginIf("!sResourceTracker->usingDirectMapping()")
         cgen.beginFor("uint32_t i = 0", "i < memoryRangeCount", "++i")
         cgen.stmt("auto range = pMemoryRanges[i]")
-        cgen.stmt("auto memory = pMemoryRanges[i].memory")
-        cgen.stmt("auto size = pMemoryRanges[i].size")
-        cgen.stmt("auto offset = pMemoryRanges[i].offset")
+        cgen.stmt("auto memory = range.memory")
+        cgen.stmt("auto size = range.size")
+        cgen.stmt("auto offset = range.offset")
         cgen.stmt("uint64_t streamSize = 0")
         cgen.stmt("if (!memory) { %s->write(&streamSize, sizeof(uint64_t)); continue; }" % streamVar)
         cgen.stmt("auto hostPtr = sResourceTracker->getMappedPointer(memory)")
@@ -593,9 +593,9 @@ def encode_vkInvalidateMappedMemoryRanges(typeInfo, api, cgen):
         cgen.beginIf("!sResourceTracker->usingDirectMapping()")
         cgen.beginFor("uint32_t i = 0", "i < memoryRangeCount", "++i")
         cgen.stmt("auto range = pMemoryRanges[i]")
-        cgen.stmt("auto memory = pMemoryRanges[i].memory")
-        cgen.stmt("auto size = pMemoryRanges[i].size")
-        cgen.stmt("auto offset = pMemoryRanges[i].offset")
+        cgen.stmt("auto memory = range.memory")
+        cgen.stmt("auto size = range.size")
+        cgen.stmt("auto offset = range.offset")
         cgen.stmt("uint64_t streamSize = 0")
         cgen.stmt("if (!memory) { %s->read(&streamSize, sizeof(uint64_t)); continue; }" % streamVar)
         cgen.stmt("auto hostPtr = sResourceTracker->getMappedPointer(memory)")