fixes, dealing with duplicates