#75 locator aware by

Fix #75. 
Signed-off-by: niels <opensource21@gmail.com>