Patched geostubbing to allow address changes in response