[TienLP] fix bugs 28/2
Merge branch 'TienLP'