diff --git a/src/v07/EntryPoint.sol b/src/v07/EntryPoint.sol
index 46762bf..b415a2e 100644
--- a/src/v07/EntryPoint.sol
+++ b/src/v07/EntryPoint.sol
@@ -564,8 +564,12 @@ contract EntryPoint is IEntryPoint, StakeManager, NonceManager, ReentrancyGuard
         public
         returns (uint256 validationData, uint256 paymasterValidationData, uint256 paymasterVerificationGasLimit)
     {
-        MemoryUserOp memory mUserOp = outOpInfo.mUserOp;
         bytes memory context;
+
+        MemoryUserOp memory mUserOp = outOpInfo.mUserOp;
+        _copyUserOpToMemory(userOp, mUserOp);
+        outOpInfo.userOpHash = getUserOpHash(userOp);
+
         uint256 requiredPreFund = _getRequiredPrefund(mUserOp);
         if (mUserOp.paymaster != address(0)) {
             (context, paymasterValidationData) =