Fix for CIDR