fix remove()