fixed (hopefully) the routing-crap