eliminate race on shutdown
eliminate race on shutdown