Fixed the TA bug