add more fix on t6 branch