issue #682 exception fixed
issue #682 UI bug fixed