diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java
index 52867d92d83..507cb388478 100644
--- a/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java
+++ b/compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java
@@ -213,18 +213,14 @@ public class InterceptionInstrumenter implements Instrumenter {
 
                 if (applicableInstrumenters.isEmpty()) return mv;
 
-                InstructionAdapter ia = new InstructionAdapter(mv);
-
                 final List<MethodData> exitData = new ArrayList<MethodData>();
+                final List<MethodData> enterData = new ArrayList<MethodData>();
                 for (MethodInstrumenter instrumenter : applicableInstrumenters) {
-                    for (MethodData enterData : instrumenter.getEnterData()) {
-                        invokeMethod(access, name, desc, ia, enterData);
-                    }
-
+                    enterData.addAll(instrumenter.getEnterData());
                     exitData.addAll(instrumenter.getExitData());
                 }
 
-                if (exitData.isEmpty()) return mv;
+                if (enterData.isEmpty() && exitData.isEmpty()) return mv;
 
                 return new MethodVisitor(ASM4, mv) {
 
@@ -237,6 +233,14 @@ public class InterceptionInstrumenter implements Instrumenter {
                         return ia;
                     }
 
+                    @Override
+                    public void visitCode() {
+                        for (MethodData methodData : enterData) {
+                            invokeMethod(access, name, desc, getInstructionAdapter(), methodData);
+                        }
+                        super.visitCode();
+                    }
+
                     @Override
                     public void visitInsn(int opcode) {
                         switch (opcode) {