Totally fixed the double-add problem