diff --git a/src/yggdrasil/switch.go b/src/yggdrasil/switch.go
index f4df60d5..ece2fa26 100644
--- a/src/yggdrasil/switch.go
+++ b/src/yggdrasil/switch.go
@@ -712,10 +712,15 @@ func (t *switchTable) _handleIn(packet []byte, idle map[switchPort]struct{}) boo
 		}
 	}
 	if best != nil {
-		// Send to the best idle next hop
 		delete(idle, best.elem.port)
-		ports[best.elem.port].sendPacketsFrom(t, [][]byte{packet})
-		return true
+		// Tell ourselves to send to this node later
+		// If another (e.g. even better) hop becomes idle in the mean time, it'll take the packet instead
+		// FIXME this is just a hack, but seems to help with stability...
+		go t.Act(nil, func() {
+			t._idleIn(best.elem.port)
+		})
+		//ports[best.elem.port].sendPacketsFrom(t, [][]byte{packet})
+		//return true
 	}
 	// Didn't find anyone idle to send it to
 	return false
diff --git a/src/yggdrasil/tcp.go b/src/yggdrasil/tcp.go
index ed8f7b9b..66f708c2 100644
--- a/src/yggdrasil/tcp.go
+++ b/src/yggdrasil/tcp.go
@@ -233,8 +233,9 @@ func (t *tcp) call(saddr string, options interface{}, sintf string) {
 		}
 		defer func() {
 			// Block new calls for a little while, to mitigate livelock scenarios
-			time.Sleep(default_timeout)
-			time.Sleep(time.Duration(rand.Intn(1000)) * time.Millisecond)
+			rand.Seed(time.Now().UnixNano())
+			delay := default_timeout + time.Duration(rand.Intn(10000))*time.Millisecond
+			time.Sleep(delay)
 			t.mutex.Lock()
 			delete(t.calls, callname)
 			t.mutex.Unlock()