Fixed remove()