Fix sync order