[RFR] Fix entity creation

Fixes #67