Fix route collector