Fixing autoconfiguration