Bug fixed on Row count