bug fixes: delete & add