CS fix