Another ambiguity fix