Bugfix ServiceDelegate