[BUGFIX] Code referenced container which was not in constructor
Merge branch 'hotfix/v1.0.5'