Fixed command context