Ambiguities fix