diff --git a/contracts/base/Executor.sol b/contracts/base/Executor.sol
index 4b9ca3146..85d44acd9 100644
--- a/contracts/base/Executor.sol
+++ b/contracts/base/Executor.sol
@@ -5,6 +5,12 @@ import "../common/Enum.sol";
 /// @title Executor - A contract that can execute transactions
 /// @author Richard Meissner - <richard@gnosis.pm>
 contract Executor {
+    /// @dev Executes either a delegatecall or a call with provided parameters
+    /// @param to Destination address.
+    /// @param value Ether value.
+    /// @param data Data payload.
+    /// @param operation Operation type.
+    /// @return success boolean flag indicating if the call succeeded
     function execute(
         address to,
         uint256 value,
diff --git a/contracts/base/ModuleManager.sol b/contracts/base/ModuleManager.sol
index e6a280a10..3db31b11c 100644
--- a/contracts/base/ModuleManager.sol
+++ b/contracts/base/ModuleManager.sol
@@ -67,7 +67,7 @@ contract ModuleManager is SelfAuthorized, Executor {
         // Only whitelisted modules are allowed.
         require(msg.sender != SENTINEL_MODULES && modules[msg.sender] != address(0), "GS104");
         // Execute transaction without further confirmations.
-        success = execute(to, value, data, operation, gasleft());
+        success = execute(to, value, data, operation, type(uint256).max);
         if (success) emit ExecutionFromModuleSuccess(msg.sender);
         else emit ExecutionFromModuleFailure(msg.sender);
     }