[TienLP] Fix bugs #058, #066