fix location bug.
Merge branch 'fix/bugs' into develop
commit.