fixed location bug
merge