Improved handling of ambiguous directions