fix loop on delete?