bug fix for services, CCC-83
Merge pull request #4 from fozeek/qdeneuve-feat-bugFixService-CCC-83

CCC-83, Bug fix for services