Implement suggested changes

In case of ambiguity, return first result.