Fixed rowCount issue