Bugfix for public services