Little usability improvement