Usability fix