upstream dupes fix
WIP