Fixed up CIList