One more fix to EXTERNAL_IP logic