CCS fix