bugfix: location