Data update issue fix