Route fix final