Bugfix for Service.py