Fixed Auto Discovery