fixed entity class