fixed entities errors