Fix dynamic scoping
Merge pull request #36 from mcanevet/fix/dynamic_scoping

Fix dynamic scoping