fixed missing things
Merge branch 'hotfix/fix_first_feature'