Fixed tunneling issue