diff --git a/packages/bot/core/core.class.js b/packages/bot/core/core.class.js
index 7550dd0..4243713 100644
--- a/packages/bot/core/core.class.js
+++ b/packages/bot/core/core.class.js
@@ -123,7 +123,7 @@ class CoreClass {
 
         // 📄 [options: callback]: Si se tiene un callback se ejecuta
         if (!fallBackFlag) {
-            if (refToContinue?.options?.capture) cbEveryCtx(refToContinue?.ref)
+            if (prevMsg?.options?.capture) cbEveryCtx(prevMsg?.ref)
             for (const ite of this.flowClass.find(body)) {
                 if (!ite?.options?.capture) cbEveryCtx(ite?.ref)
             }
diff --git a/packages/bot/package.json b/packages/bot/package.json
index 4a722ce..77cb142 100644
--- a/packages/bot/package.json
+++ b/packages/bot/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@bot-whatsapp/bot",
-    "version": "0.0.42-alpha.0",
+    "version": "0.0.45-alpha.0",
     "description": "",
     "main": "./lib/bundle.bot.cjs",
     "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5a0007c..04118d7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@bot-whatsapp/cli",
-    "version": "0.0.49-alpha.0",
+    "version": "0.0.52-alpha.0",
     "description": "",
     "main": "index.js",
     "devDependencies": {
diff --git a/packages/contexts/src/dialogflow/dialogflow.class.js b/packages/contexts/src/dialogflow/dialogflow.class.js
index ffe50e7..ebd92bc 100644
--- a/packages/contexts/src/dialogflow/dialogflow.class.js
+++ b/packages/contexts/src/dialogflow/dialogflow.class.js
@@ -97,13 +97,21 @@ class DialogFlowContext extends CoreClass {
             })
 
             customPayload = {
-                media: fields?.media?.stringValue,
-                buttons: mapButtons,
+                options: {
+                    media: fields?.media?.stringValue,
+                    buttons: mapButtons,
+                },
             }
+
+            const ctxFromDX = {
+                ...customPayload,
+                answer: fields?.answer?.stringValue,
+            }
+            this.sendFlow([ctxFromDX], from)
+            return
         }
 
         const ctxFromDX = {
-            ...customPayload,
             answer: queryResult?.fulfillmentText,
         }
 
diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json
index ddfae8e..bb19123 100644
--- a/packages/create-bot-whatsapp/package.json
+++ b/packages/create-bot-whatsapp/package.json
@@ -1,6 +1,6 @@
 {
     "name": "create-bot-whatsapp",
-    "version": "0.0.60-alpha.0",
+    "version": "0.0.63-alpha.0",
     "description": "",
     "main": "./lib/bundle.create-bot-whatsapp.cjs",
     "files": [
diff --git a/packages/database/package.json b/packages/database/package.json
index 6d8e007..cdab548 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@bot-whatsapp/database",
-    "version": "0.0.41-alpha.0",
+    "version": "0.0.44-alpha.0",
     "description": "Esto es el conector a  mysql, pg, mongo",
     "main": "./lib/mock/index.cjs",
     "keywords": [],
diff --git a/packages/provider/package.json b/packages/provider/package.json
index d5c0ea2..4c53f47 100644
--- a/packages/provider/package.json
+++ b/packages/provider/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@bot-whatsapp/provider",
-    "version": "0.0.47-alpha.0",
+    "version": "0.0.50-alpha.0",
     "description": "Esto es el conector a Twilio, Meta, etc...",
     "main": "./lib/mock/index.cjs",
     "keywords": [],
diff --git a/packages/provider/src/baileys/index.js b/packages/provider/src/baileys/index.js
index 3b46135..7f25b80 100644
--- a/packages/provider/src/baileys/index.js
+++ b/packages/provider/src/baileys/index.js
@@ -4,7 +4,7 @@ const pino = require('pino')
 const rimraf = require('rimraf')
 const mime = require('mime-types')
 const { join } = require('path')
-const { existsSync, createWriteStream } = require('fs')
+const { existsSync, createWriteStream, readFileSync } = require('fs')
 const { Console } = require('console')
 
 const {
@@ -137,7 +137,7 @@ class BaileysProvider extends ProviderClass {
                 }
 
                 const btnCtx =
-                    payload?.message?.templateButtonReplyMessage
+                    payload?.message?.buttonsResponseMessage
                         ?.selectedDisplayText
 
                 if (btnCtx) payload.body = btnCtx
@@ -167,8 +167,8 @@ class BaileysProvider extends ProviderClass {
     sendMedia = async (number, imageUrl, text) => {
         const fileDownloaded = await baileyDownloadMedia(imageUrl)
         return this.vendor.sendMessage(number, {
-            image: { url: fileDownloaded },
-            text,
+            image: readFileSync(fileDownloaded),
+            caption: text,
         })
     }
 
@@ -229,20 +229,22 @@ class BaileysProvider extends ProviderClass {
      */
 
     sendButtons = async (number, text, buttons) => {
-        const numberClean = number.replace('+', '')
+        const numberClean = baileyCleanNumber(number)
+
         const templateButtons = buttons.map((btn, i) => ({
-            index: `${i}`,
-            quickReplyButton: {
-                displayText: btn.body,
-                id: `id-btn-${i}`,
-            },
+            buttonId: `id-btn-${i}`,
+            buttonText: { displayText: btn.body },
+            type: 1,
         }))
 
-        return this.vendor.sendMessage(`${numberClean}@c.us`, {
+        const buttonMessage = {
             text,
             footer: '',
-            templateButtons: templateButtons,
-        })
+            buttons: templateButtons,
+            headerType: 1,
+        }
+
+        return this.vendor.sendMessage(numberClean, buttonMessage)
     }
 
     /**