Fixed regex problems in CommandConverter