scope/mock fix