added stop on shutdown