Fixed tunnel infra problem