fix dupes
fix dupes 2