Bugfix EditLocation