diff --git a/ql/src/semmle/go/frameworks/Gin.qll b/ql/src/semmle/go/frameworks/Gin.qll
index a39243c60e2..55aaa82d04b 100644
--- a/ql/src/semmle/go/frameworks/Gin.qll
+++ b/ql/src/semmle/go/frameworks/Gin.qll
@@ -161,7 +161,7 @@ private module Gin {
             methodName = "ShouldBindYAML"
           )
         |
-          this = call.getArgument(0)
+          this = any(FunctionOutput output | output.isParameter(0)).getExitNode(call)
         )
       )
     }
diff --git a/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected b/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
index 3c40d70cdcb..31678491a98 100644
--- a/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
+++ b/ql/test/library-tests/semmle/go/frameworks/Gin/Gin.expected
@@ -44,38 +44,38 @@
 | Gin.go:155:10:155:14 | param |
 | Gin.go:155:10:155:20 | selection of Value |
 | Gin.go:163:16:163:22 | &... |
-| Gin.go:168:16:168:28 | personPointer |
+| Gin.go:167:7:167:19 | definition of personPointer |
 | Gin.go:173:15:173:21 | &... |
-| Gin.go:178:15:178:27 | personPointer |
+| Gin.go:177:7:177:19 | definition of personPointer |
 | Gin.go:183:16:183:22 | &... |
-| Gin.go:188:16:188:28 | personPointer |
+| Gin.go:187:7:187:19 | definition of personPointer |
 | Gin.go:193:15:193:21 | &... |
-| Gin.go:198:15:198:27 | personPointer |
+| Gin.go:197:7:197:19 | definition of personPointer |
 | Gin.go:203:17:203:23 | &... |
-| Gin.go:208:17:208:29 | personPointer |
+| Gin.go:207:7:207:19 | definition of personPointer |
 | Gin.go:213:20:213:26 | &... |
-| Gin.go:218:20:218:32 | personPointer |
+| Gin.go:217:7:217:19 | definition of personPointer |
 | Gin.go:223:16:223:22 | &... |
-| Gin.go:228:16:228:28 | personPointer |
+| Gin.go:227:7:227:19 | definition of personPointer |
 | Gin.go:233:12:233:18 | &... |
-| Gin.go:238:12:238:24 | personPointer |
+| Gin.go:237:7:237:19 | definition of personPointer |
 | Gin.go:243:18:243:24 | &... |
-| Gin.go:248:18:248:30 | personPointer |
+| Gin.go:247:7:247:19 | definition of personPointer |
 | Gin.go:253:26:253:32 | &... |
-| Gin.go:258:26:258:38 | personPointer |
+| Gin.go:257:7:257:19 | definition of personPointer |
 | Gin.go:263:22:263:28 | &... |
-| Gin.go:268:22:268:34 | personPointer |
+| Gin.go:267:7:267:19 | definition of personPointer |
 | Gin.go:273:23:273:29 | &... |
-| Gin.go:278:23:278:35 | personPointer |
+| Gin.go:277:7:277:19 | definition of personPointer |
 | Gin.go:283:21:283:27 | &... |
-| Gin.go:288:21:288:33 | personPointer |
+| Gin.go:287:7:287:19 | definition of personPointer |
 | Gin.go:293:22:293:28 | &... |
-| Gin.go:298:22:298:34 | personPointer |
+| Gin.go:297:7:297:19 | definition of personPointer |
 | Gin.go:303:21:303:27 | &... |
-| Gin.go:308:21:308:33 | personPointer |
+| Gin.go:307:7:307:19 | definition of personPointer |
 | Gin.go:313:22:313:28 | &... |
-| Gin.go:318:22:318:34 | personPointer |
+| Gin.go:317:7:317:19 | definition of personPointer |
 | Gin.go:323:18:323:24 | &... |
-| Gin.go:328:18:328:30 | personPointer |
+| Gin.go:327:7:327:19 | definition of personPointer |
 | Gin.go:333:24:333:30 | &... |
-| Gin.go:338:24:338:36 | personPointer |
+| Gin.go:337:7:337:19 | definition of personPointer |