Fixed crash on update issue