Fixed TAC related bugs caused by function integration patch