fix bug 1
merge bug-1