KRACOEUS-6955 fix autowiring which didn't do correctly before
Merge pull request #360 from yyuan1/0626_fixes

KRACOEUS-6955 fix autowiring