Dependency insertion fix (container agnostic)

This should be a bit better I think..