Fix Tunnel-ID handling