diff --git a/src/code/sourceLocationTracker.js b/src/code/sourceLocationTracker.js
index 5da61f8cd0..3955bc1f62 100644
--- a/src/code/sourceLocationTracker.js
+++ b/src/code/sourceLocationTracker.js
@@ -67,7 +67,7 @@ function getSourceMap (address, code, contracts) {
   var isCreation = helper.isContractCreation(address)
   var byteProp = isCreation ? 'bytecode' : 'runtimeBytecode'
   for (var k in contracts) {
-    if (code.indexOf('0x' + contracts[k][byteProp]) === 0) {
+    if (code.replace(/.{64}0029$/, '').indexOf('0x' + contracts[k][byteProp].replace(/.{64}0029$/, '')) === 0) {
       return isCreation ? contracts[k].srcmap : srcmapRuntime(contracts[k])
     }
   }
diff --git a/src/solidity/solidityProxy.js b/src/solidity/solidityProxy.js
index c0db891e71..c15bff4940 100644
--- a/src/solidity/solidityProxy.js
+++ b/src/solidity/solidityProxy.js
@@ -136,7 +136,7 @@ function contractNameFromCode (contracts, code, address) {
   var isCreation = traceHelper.isContractCreation(address)
   var byteProp = isCreation ? 'bytecode' : 'runtimeBytecode'
   for (var k in contracts) {
-    if ('0x' + contracts[k][byteProp] === code) {
+    if ('0x' + contracts[k][byteProp].replace(/.{64}0029$/, '') === code.replace(/.{64}0029$/, '')) {
       return k
     }
   }