location bugfix