Code CS fix