diff --git a/internal/api/ccip.go b/internal/api/ccip.go
index 40e469b..e727275 100644
--- a/internal/api/ccip.go
+++ b/internal/api/ccip.go
@@ -89,8 +89,8 @@ func (a *API) ccipHandler(w http.ResponseWriter, req bunrouter.Request) error {
 	}
 
 	// TODO: Offchain lookup is performed here
-	// test.eth -> 0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045
-	// For now we stub it with a test address
+	// *.sarafu.eth -> 0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045
+	// For now we stub it with the above test address
 
 	payload, err := a.ensProvider.SignPayload(
 		common.HexToAddress(r.Sender),
diff --git a/pkg/ens/ens.go b/pkg/ens/ens.go
index e901a3a..b2daa56 100644
--- a/pkg/ens/ens.go
+++ b/pkg/ens/ens.go
@@ -35,7 +35,7 @@ func (e *ENS) SignPayload(sender common.Address, request []byte, result common.A
 		return "0x", err
 	}
 
-	resp, err := encodeABIParameters(payload.Bytes(), expiryTimestamp(), sig)
+	resp, err := encodeABIParameters(common.LeftPadBytes(result.Bytes(), 32), expiryTimestamp(), sig)
 	if err != nil {
 		return "0x", err
 	}