Fixed override

Now can overwrite an entity with itself.