Fixes service-assertion
Merge pull request #36 from heiglandreas/feature/FixServiceRetrieval

Fixes service-assertion