fixed bug
merge