saved inheritance in wrong node
Fixes #84
use Entity directly
Fixes #83