Fix commands context choice
Merge pull request #322 from lightglitch/master

Fix commands context choice