Tunnel interaction fix