Changed to stop on server stop