Fixed bug #79257

Replace an existing entry for a given name only if we have a match.