improves on locator loads on starting
Merge pull request #1790 from diegosarmentero/master

improves on locator loads on starting