Fix strict variables
Merge pull request #804 from hunner/strict_variables

Fix strict variables