resolving ambiguities
Ambiguity fixed