Fix instrumentation