Fix for the usability patch just committed