Do you reckon you can change this locator to work like the `_gps_*_locator` a few lines below this one, checking on the `name` attribute? I think it will be a bit more reliable then.