fixing dual-update issue