bugfix for location