[BUGFIX] Incorrect variable container index
Merge pull request #632 from bjo3rnf/deferredfix

[BUGFIX] Incorrect variable container index