fixed minor bug
merge