Fix XXX

add compatibility to TCA