fix EntityBase