Tunnel IP fix