Bug fix on T2 annotation