Fix addEntity