Fixed tunnel bug