fix for core data, locations