Another attempt at fixing bug on first row in builder.