Correctly deal with no row selection