bugfix in Service (thanks to funkygao)