BS 140911 fix some bug
Thien commit