Another attempt at fixing the rows