Fix first row bug; dont use next()