Still need explicit base::local()

Still need explicit base::local() #862