fix bug
merge the changes