let's try to fix this again
Merge pull request #132 from m8ttyB/locator_tweak

let's try to fix this again