diff --git a/kex-core/src/main/kotlin/org/vorpal/research/kex/asm/transform/SymbolicTraceInstrumenter.kt b/kex-core/src/main/kotlin/org/vorpal/research/kex/asm/transform/SymbolicTraceInstrumenter.kt
index 219d43d60..8f0c13039 100644
--- a/kex-core/src/main/kotlin/org/vorpal/research/kex/asm/transform/SymbolicTraceInstrumenter.kt
+++ b/kex-core/src/main/kotlin/org/vorpal/research/kex/asm/transform/SymbolicTraceInstrumenter.kt
@@ -738,6 +738,16 @@ class SymbolicTraceInstrumenter(
             else -> values.nullConstant to values.nullConstant
         }
         val instrumented = buildList {
+            if (inst.hasReturnValue) {
+                addAll(track(inst.returnValue))
+            }
+            val currentMethod = inst.parent.method
+            if (!currentMethod.isStatic) {
+                addAll(track(values.getThis(currentMethod.klass)))
+            }
+            for ((index, type) in currentMethod.argTypes.withIndex()) {
+                addAll(track(values.getArgument(index, currentMethod, type)))
+            }
             add(
                 collectorClass.interfaceCall(
                     returnMethod, traceCollector,