Added Thom's databinding solution
Locator fix