Fixed contact locator based on the changes from bug 835742
Merge pull request #390 from davehunt/fix-contact-locator

Fixed contact locator based on the changes from bug 835742