issue-24: updating before fix for duplicate