diff --git a/src/logic/tokens/utils/tokenHelpers.js b/src/logic/tokens/utils/tokenHelpers.js
index 9b6529c2..c12d3287 100644
--- a/src/logic/tokens/utils/tokenHelpers.js
+++ b/src/logic/tokens/utils/tokenHelpers.js
@@ -62,10 +62,10 @@ export const isTokenTransfer = (data: string, value: number): boolean =>
 export const isMultisendTransaction = (data: string, value: number): boolean =>
   !!data && data.substring(0, 10) === '0x8d80ff0a' && value === 0
 
-// f08a0323 - setFallbackHandler (308, 8)
-// 7de7edef - changeMasterCopy (550, 8)
+// 7de7edef - changeMasterCopy (308, 8)
+// f08a0323 - setFallbackHandler (550, 8)
 export const isUpgradeTransaction = (data: string) =>
-  !!data && data.substr(308, 8) === 'f08a0323' && data.substr(550, 8) === '7de7edef'
+  !!data && data.substr(308, 8) === '7de7edef' && data.substr(550, 8) === 'f08a0323'
 
 export const isERC721Contract = async (contractAddress: string): boolean => {
   const ERC721Token = await getStandardTokenContract()
diff --git a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/utils.js b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/utils.js
index 7b0bb75a..111e62d0 100644
--- a/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/utils.js
+++ b/src/routes/safe/components/Transactions/TxsTable/ExpandedTx/TxDescription/utils.js
@@ -18,7 +18,7 @@ type DecodedTxData = {
 }
 
 const getSafeVersion = (data: string) => {
-  const contractAddress = data.substr(582, 40).toLowerCase()
+  const contractAddress = data.substr(340, 40).toLowerCase()
 
   return (
     {