Added checks to ensure items aren't duplicated forever