diff --git a/.forge-snapshots/PositionManager_permit.snap b/.forge-snapshots/PositionManager_permit.snap
index e62c334b6..91d40b53d 100644
--- a/.forge-snapshots/PositionManager_permit.snap
+++ b/.forge-snapshots/PositionManager_permit.snap
@@ -1 +1 @@
-79506
\ No newline at end of file
+79509
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_permit_secondPosition.snap b/.forge-snapshots/PositionManager_permit_secondPosition.snap
index a0c684a2e..49fe277f5 100644
--- a/.forge-snapshots/PositionManager_permit_secondPosition.snap
+++ b/.forge-snapshots/PositionManager_permit_secondPosition.snap
@@ -1 +1 @@
-62394
\ No newline at end of file
+62397
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_permit_twice.snap b/.forge-snapshots/PositionManager_permit_twice.snap
index 2439b1797..0776cccb8 100644
--- a/.forge-snapshots/PositionManager_permit_twice.snap
+++ b/.forge-snapshots/PositionManager_permit_twice.snap
@@ -1 +1 @@
-45282
\ No newline at end of file
+45285
\ No newline at end of file
diff --git a/src/libraries/ERC721PermitHash.sol b/src/libraries/ERC721PermitHash.sol
index 4301dbfb0..8ecdff391 100644
--- a/src/libraries/ERC721PermitHash.sol
+++ b/src/libraries/ERC721PermitHash.sol
@@ -17,7 +17,7 @@ library ERC721PermitHashLibrary {
         assembly ("memory-safe") {
             let fmp := mload(0x40)
             mstore(fmp, PERMIT_TYPEHASH)
-            mstore(add(fmp, 0x20), spender)
+            mstore(add(fmp, 0x20), and(spender, 0xffffffffffffffffffffffffffffffffffffffff))
             mstore(add(fmp, 0x40), tokenId)
             mstore(add(fmp, 0x60), nonce)
             mstore(add(fmp, 0x80), deadline)
@@ -34,8 +34,8 @@ library ERC721PermitHashLibrary {
         assembly ("memory-safe") {
             let fmp := mload(0x40)
             mstore(fmp, PERMIT_FOR_ALL_TYPEHASH)
-            mstore(add(fmp, 0x20), operator)
-            mstore(add(fmp, 0x40), approved)
+            mstore(add(fmp, 0x20), and(operator, 0xffffffffffffffffffffffffffffffffffffffff))
+            mstore(add(fmp, 0x40), and(approved, 0x1))
             mstore(add(fmp, 0x60), nonce)
             mstore(add(fmp, 0x80), deadline)
             digest := keccak256(fmp, 0xa0)