fix first_pull & order