Ambiguity fix