fix dep inj
Merge branch 'hotfix/fix_for_dep_inj'