diff --git a/hop/client.go b/hop/client.go
index b89d6fa..01f7e02 100644
--- a/hop/client.go
+++ b/hop/client.go
@@ -110,7 +110,7 @@ func NewClient(cfg HopClientConfig) error {
 
 	go hopClient.cleanUp()
 
-	iface, err := newTun("")
+	iface, err := newTun()
 	if err != nil {
 		return err
 	}
diff --git a/hop/iface.go b/hop/iface.go
index 3ba71aa..62835b5 100644
--- a/hop/iface.go
+++ b/hop/iface.go
@@ -38,9 +38,9 @@ var invalidAddr = errors.New("Invalid device ip address")
 
 var tun_peer net.IP
 
-func newTun(name string) (iface *water.Interface, err error) {
+func newTun() (iface *water.Interface, err error) {
 
-	iface, err = water.NewTUN(name)
+	iface, err = water.New(water.Config{})
 	if err != nil {
 		return nil, err
 	}
diff --git a/hop/server.go b/hop/server.go
index 79bc7ee..ac48c8c 100644
--- a/hop/server.go
+++ b/hop/server.go
@@ -96,7 +96,7 @@ func NewServer(cfg HopServerConfig) error {
 	hopServer.toNet = make([]chan *udpPacket, (cfg.HopEnd - cfg.HopStart + 1))
 	hopServer.ippool = new(hopIPPool)
 
-	iface, err := newTun("")
+	iface, err := newTun()
 	if err != nil {
 		return err
 	}
diff --git a/scripts/chnroute-up.sh b/scripts/chnroute-up.sh
index 02f4125..ace691a 100755
--- a/scripts/chnroute-up.sh
+++ b/scripts/chnroute-up.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 
-OLDGW=$(ip route show 0/0 | head -n1 | grep 'via' | grep -Po '\d+\.\d+\.\d+\.\d+')
+OLDGW=$(ip route show 0/0 | awk '{print $3}')
 
 if [ $OLDGW == '' ]; then
     exit 0