Fix route construction