Fix the subnet issue