Fix overlapped CID ranges