Tp timeout improve