Apply CS fix