fix bug with remove button