searching bug
merge