ambiguities fixed