Fix bug (hack ...?) with entities being duped