From 9b86659ff548097006afacf55a16da8df8db28d1 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 13 Feb 2017 10:31:14 +0100
Subject: [PATCH] will fix in other pr

---
 src/util/internalCallTree.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/util/internalCallTree.js b/src/util/internalCallTree.js
index 351ce8f0d1..5f8b2d6daa 100644
--- a/src/util/internalCallTree.js
+++ b/src/util/internalCallTree.js
@@ -97,7 +97,7 @@ async function buildTree (tree, step, scopeId) {
     if (!sourceLocation) {
       return { outStep: step, error: 'InternalCallTree - No source Location. ' + step }
     }
-    if (sourceLocation.jump === 'i' || traceHelper.isCallInstruction(tree.traceManager.trace[step])) {
+    if (sourceLocation.jump === 'i') {
       try {
         var result = await buildTree(tree, step + 1, scopeId === '' ? subScope.toString() : scopeId + '.' + subScope)
         if (result.error) {
@@ -109,8 +109,7 @@ async function buildTree (tree, step, scopeId) {
       } catch (e) {
         return { outStep: step, error: 'InternalCallTree - ' + e.message }
       }
-    } else if (sourceLocation.jump === 'o' || traceHelper.isReturnInstruction(tree.traceManager.trace[step]) || traceHelper.isStopInstruction(tree.traceManager.trace[step])) {
-      // traceHelper.isReturnInstruction should be replaced by a more complex structure so it can handle out of gas
+    } else if (sourceLocation.jump === 'o') {
       tree.scopes[scopeId].lastStep = step
       return { outStep: step + 1 }
     } else {