Bug/329/locator reversed coords