Bug fix on T4 interface