diff --git a/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositor.sol b/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositor.sol
index 01b0032..ab46d6f 100644
--- a/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositor.sol
+++ b/contracts/p2pEth2Depositor/P2pOrgUnlimitedEthDepositor.sol
@@ -307,7 +307,7 @@ contract P2pOrgUnlimitedEthDepositor is ERC165, IP2pOrgUnlimitedEthDepositor {
             mstore(add(withdrawalCredentials, 32), _eth2WithdrawalCredentials)
         }
 
-        for (uint256 i = 0; i < validatorCount; ) {
+        for (uint256 i = 0; i < validatorCount; ++i) {
             // pubkey, withdrawal_credentials, signature lengths are already checked inside Beacon DepositContract
 
             i_depositContract.deposit{value: _ethAmountPerValidatorInWei}(
@@ -316,12 +316,6 @@ contract P2pOrgUnlimitedEthDepositor is ERC165, IP2pOrgUnlimitedEthDepositor {
                 _signatures[i],
                 _depositDataRoots[i]
             );
-
-            // An array can't have a total length
-            // larger than the max uint256 value.
-            unchecked {
-                ++i;
-            }
         }
 
         emit P2pOrgUnlimitedEthDepositor__Eth2Deposit(
diff --git a/foundry.toml b/foundry.toml
index a135f3d..c44021c 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -5,6 +5,7 @@ libs = ['node_modules', 'lib']
 test = 'test/foundry'
 cache_path  = 'forge-cache'
 solc-version = "0.8.24"
+evm_version = 'cancun'
 via_ir = true
 optimizer = true
 optimizer-runs = 200