Change sync order for more correct work