(TTA) Fix bugs but may reduce performances