[01092014] - Thien commit fix some bug