fixed the instrumentation to work nicely with spray