CS and temporary fix