Fix: CommandBuilder cannot add flag values