Fix for store file instrumentation