Merge pull request #221 from angathorion/dependency-insertion-fix
Dependency insertion fix (container agnostic)

(main@0594458823c83ee57474f0a2eeeede102168606b)