Manual instrumentation fix