diff --git a/.forge-snapshots/PositionManager_burn_empty.snap b/.forge-snapshots/PositionManager_burn_empty.snap
index af70ec6f..bad154b1 100644
--- a/.forge-snapshots/PositionManager_burn_empty.snap
+++ b/.forge-snapshots/PositionManager_burn_empty.snap
@@ -1 +1 @@
-46784
\ No newline at end of file
+46765
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_empty_native.snap b/.forge-snapshots/PositionManager_burn_empty_native.snap
index b3b9d8c2..f4894227 100644
--- a/.forge-snapshots/PositionManager_burn_empty_native.snap
+++ b/.forge-snapshots/PositionManager_burn_empty_native.snap
@@ -1 +1 @@
-46601
\ No newline at end of file
+46583
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty.snap b/.forge-snapshots/PositionManager_burn_nonEmpty.snap
index c2b29f66..07904dea 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty.snap
@@ -1 +1 @@
-129648
\ No newline at end of file
+129633
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native.snap
index b46b49cf..bdea68d3 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_native.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_native.snap
@@ -1 +1 @@
-122570
\ No newline at end of file
+122555
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
index 7dc8c46f..eb3d0056 100644
--- a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
+++ b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
@@ -1 +1 @@
-133516
\ No newline at end of file
+133499
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
index 0faf4d69..ef469282 100644
--- a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
+++ b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
@@ -1 +1 @@
-126256
\ No newline at end of file
+126238
\ No newline at end of file
diff --git a/src/PositionManager.sol b/src/PositionManager.sol
index 7b4d6795..6e1bc2b3 100644
--- a/src/PositionManager.sol
+++ b/src/PositionManager.sol
@@ -7,6 +7,7 @@ import {PoolIdLibrary} from "@uniswap/v4-core/src/types/PoolId.sol";
 import {Currency, CurrencyLibrary} from "@uniswap/v4-core/src/types/Currency.sol";
 import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";
 import {SafeCast} from "@uniswap/v4-core/src/libraries/SafeCast.sol";
+import {Position} from "@uniswap/v4-core/src/libraries/Position.sol";
 import {StateLibrary} from "@uniswap/v4-core/src/libraries/StateLibrary.sol";
 import {TransientStateLibrary} from "@uniswap/v4-core/src/libraries/TransientStateLibrary.sol";
 import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol";
@@ -202,9 +203,8 @@ contract PositionManager is
         view
         returns (uint128 liquidity)
     {
-        // TODO: Calculate positionId with Position.calculatePositionKey in v4-core.
         bytes32 positionId =
-            keccak256(abi.encodePacked(address(this), config.tickLower, config.tickUpper, bytes32(tokenId)));
+            Position.calculatePositionKey(address(this), config.tickLower, config.tickUpper, bytes32(tokenId));
         liquidity = poolManager.getPositionLiquidity(config.poolKey.toId(), positionId);
     }