fixed routing duplicates