Add workaround for tunnel connectivity