fixed a bug
merge