[Fix] Record order issue