Fixed #21413 -- resolve_columns fields misalignment