Handle ambiguity better