better handling of ambiguities