Fix bug with static current route ID