Fixed command parser