fix + avoid dupes