diff --git a/contracts/ALLINONE.sol b/contracts/ALLINONE.sol
index 78feb40..33955e8 100644
--- a/contracts/ALLINONE.sol
+++ b/contracts/ALLINONE.sol
@@ -208,7 +208,7 @@ contract SuNFT is ERC165, ERC721, ERC721Metadata, ERC721Enumerable, SupportsInte
         address owner = _tokenOwnerWithSubstitutions[_tokenId];
         require(msg.sender == owner ||
           msg.sender == tokenApprovals[_tokenId] ||
-          operatorApprovals[msg.sender][msg.sender]);
+          operatorApprovals[owner][msg.sender]);
         _;
     }
 
diff --git a/contracts/SuNFT.sol b/contracts/SuNFT.sol
index cae8e89..1a251f8 100644
--- a/contracts/SuNFT.sol
+++ b/contracts/SuNFT.sol
@@ -45,7 +45,7 @@ contract SuNFT is ERC165, ERC721, ERC721Metadata, ERC721Enumerable, SupportsInte
         address owner = _tokenOwnerWithSubstitutions[_tokenId];
         require(msg.sender == owner ||
           msg.sender == tokenApprovals[_tokenId] ||
-          operatorApprovals[msg.sender][msg.sender]);
+          operatorApprovals[owner][msg.sender]);
         _;
     }