initial entity fix.