bug fix

bug fix
Merge branch 'Junnan'