diff --git a/packages/bot-engine/src/updateVariablesInSession.ts b/packages/bot-engine/src/updateVariablesInSession.ts
index 5e059f265..1e91d5c31 100644
--- a/packages/bot-engine/src/updateVariablesInSession.ts
+++ b/packages/bot-engine/src/updateVariablesInSession.ts
@@ -11,6 +11,7 @@ type Props = {
   newVariables: VariableWithUnknowValue[];
   currentBlockId: string | undefined;
 };
+// TODO: Refacto newVariables param first, other in second
 export const updateVariablesInSession = ({
   state,
   newVariables,
diff --git a/packages/embeds/js/package.json b/packages/embeds/js/package.json
index 2b00860f0..54910bc8a 100644
--- a/packages/embeds/js/package.json
+++ b/packages/embeds/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/js",
-  "version": "0.3.85",
+  "version": "0.3.86",
   "description": "Javascript library to display typebots on your website",
   "license": "FSL-1.1-ALv2",
   "type": "module",
diff --git a/packages/embeds/js/src/features/blocks/inputs/buttons/components/Buttons.tsx b/packages/embeds/js/src/features/blocks/inputs/buttons/components/Buttons.tsx
index 7bc497129..da5cd5573 100644
--- a/packages/embeds/js/src/features/blocks/inputs/buttons/components/Buttons.tsx
+++ b/packages/embeds/js/src/features/blocks/inputs/buttons/components/Buttons.tsx
@@ -32,7 +32,7 @@ export const Buttons = (props: Props) => {
 
     props.onSubmit({
       type: "text",
-      value: value ?? content ?? "",
+      value: value || content || "",
       label: value ? content : undefined,
     });
   };
diff --git a/packages/embeds/js/src/features/blocks/inputs/pictureChoice/SinglePictureChoice.tsx b/packages/embeds/js/src/features/blocks/inputs/pictureChoice/SinglePictureChoice.tsx
index 7ac51d074..5830fd14b 100644
--- a/packages/embeds/js/src/features/blocks/inputs/pictureChoice/SinglePictureChoice.tsx
+++ b/packages/embeds/js/src/features/blocks/inputs/pictureChoice/SinglePictureChoice.tsx
@@ -26,7 +26,7 @@ export const SinglePictureChoice = (props: Props) => {
     if (!item) return;
     return props.onSubmit({
       type: "text",
-      label: isNotEmpty(item.title) ? item.title : (item.pictureSrc ?? item.id),
+      label: isNotEmpty(item.title) ? item.title : item.pictureSrc || item.id,
       value: isNotEmpty(item.value) ? item.value : item.id,
     });
   };
diff --git a/packages/embeds/nextjs/package.json b/packages/embeds/nextjs/package.json
index b767931bb..9e74c2d93 100644
--- a/packages/embeds/nextjs/package.json
+++ b/packages/embeds/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/nextjs",
-  "version": "0.3.85",
+  "version": "0.3.86",
   "license": "FSL-1.1-ALv2",
   "description": "Convenient library to display typebots on your Next.js website",
   "type": "module",
diff --git a/packages/embeds/react/package.json b/packages/embeds/react/package.json
index 5f94b8983..b3e01e4c5 100644
--- a/packages/embeds/react/package.json
+++ b/packages/embeds/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typebot.io/react",
-  "version": "0.3.85",
+  "version": "0.3.86",
   "description": "Convenient library to display typebots on your React app",
   "license": "FSL-1.1-ALv2",
   "type": "module",