some fixes in locator
Merge pull request #1505 from diegosarmentero/master

some fixes in locator