Service.pp bugfix