Issue with the routing, needs fixing