Fix PlainCommand