Fix commands context choice