Fixed routing duplicates