Improve service stop