UI with ambiguity resolution => #146 fixed