fix ambiguities