diff --git a/src/calltree.js b/src/calltree.js
index 4379bd1..d1c1a57 100644
--- a/src/calltree.js
+++ b/src/calltree.js
@@ -280,6 +280,8 @@ const jump_calltree_node = (_state, _current_calltree_node) => {
   } else {
     const frame = next.frames[active_calltree_node.id]
     callsite_node = find_node(frame, n => 
+      (n.type == 'function_call' || n.type == 'new')
+      &&
       n.result?.call?.id == current_calltree_node.id
     )
     loc = {
diff --git a/src/eval.js b/src/eval.js
index 1d22e6b..2cb624e 100644
--- a/src/eval.js
+++ b/src/eval.js
@@ -1050,7 +1050,7 @@ const eval_decl_pair = (s, eval_cxt, frame_cxt) => {
 
   return {
     ok: true,
-    node: {...s_evaled, result: node.result},
+    node: {...s_evaled, result: {...node.result, call: null}},
     eval_cxt: {
       ...next_eval_cxt,
       scope: {...next_eval_cxt.scope, ...next_scope},