fix sync order