hopefully fixed dupes