Fixed ambiguous calls