Fixed command matching