@ Jeff
What version did you upgrade from? If you edit an entry and do nothing but click update, does the duplicate address disappear?