Fix service start
Merge branch 'service_start'