Fixed bug with voided rows