Deal with the TCSAE instead of the TCE

Related to #346