fix EntityBase
Merge branch 'first'