Fix module usage with strict_variables
Merge pull request #721 from mcanevet/fix/strict_variables

Fix module usage with strict_variables