Service.pp bugfix2