Fixing IP discovery