tunnel bugfix