some fixed
merge