Fix context error in State class
Merge branch 'hotfix'