Fix some bugs in the command formation.
Fix some bugs in the command formation.

sorgerlab/belpy,johnbachman/indra,johnbachman/belpy,pvtodorov/indra,johnbachman/indra,bgyori/indra,bgyori/indra,sorgerlab/belpy,sorgerlab/indra,johnbachman/belpy,johnbachman/indra,pvtodorov/indra,sorgerlab/indra,sorgerlab/belpy,sorgerlab/indra,pvtodorov/indra,johnbachman/belpy,bgyori/indra,pvtodorov/indra