Fix Update Order