fix the routing issues!