round three of CIDR fixes; spotted by Tomoki AONO