fixing tunneling