CE2CS final fix