DataManager Locator fix