Add close_range(2) support