diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 46f7b75..bdd5c62 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.20.x
+          go-version: 1.21.x
 
       - name: Check out code
         uses: actions/checkout@v4
diff --git a/client.go b/client.go
index 0ad04d8..5d74157 100644
--- a/client.go
+++ b/client.go
@@ -391,6 +391,10 @@ func (c *Client) queryMultiple(host string, requestTypes []uint16, resolver Reso
 				err = dnsdata.ParseFromMsg(resp)
 			}
 
+			// Note: this will refer only to the last valid response
+			// the whole series of responses can be found in the dnsdata.Raw field
+			dnsdata.RawResp = resp
+
 			// populate anyway basic info
 			dnsdata.Host = host
 			switch {