fix service handling
Merge pull request #218 from kived/service-fix

fix service handling