potential bugfix on the location