Proximity fix

@pimnijdam could yo QA?