More generic fix for following location references.