Fix Update method