fix first_pull & order 2