fixing double-add issue