Minor bug fix and usability improvement.