fixed inherit
Merge branch 'hotfix/inherit'