Fix context access
Merge pull request #5 from sgnr/fix-context-access

Fix context access