Improve LAN only support