Finally fixed tlib issue