Update according to new API.
Remove ambiguity.