fix bug
merge bug fix 101