Better fix for network mode