Minor fix to CTSFSS. Still needs improvement.