Fixed unexpected CS behavior