Bug from TA fix