Added a temp workaround for the adding-duplicates issue