Fix routing ambiguity