fix bug
Merge branch 'Bob-Liu/master'