Bugfixing for discovery service