fix unsafe update issue.a