Bug fix remove()