Fix problem with generic proximity handling.