Enabled correct stop service on shutdown