fix tlib refactoting