fix bug with remove