Fixed omitting first system from CDM