Fixing the entity implementation.