Service fix - stopped on exit