Bug fixup on SendCommand