Fixing autodiscovering