fixed bug with remove button