Fixing for similar key but different name & addr