External constructor call instrumentation fixed