I think I really fixed random routing this time