fixing instrumentation