Fix usability issue