strict_variables fix
Merge pull request #835 from mcanevet/fix/strict_variables

strict_variables fix