issue 1676 fixed usability issue