[Nice Review] Fix bugs when only "d" changes.