diff --git a/legacy/elm_code/src/lib/elm_code_widget.c b/legacy/elm_code/src/lib/elm_code_widget.c
index 79c6eae812..e14cce6611 100644
--- a/legacy/elm_code/src/lib/elm_code_widget.c
+++ b/legacy/elm_code/src/lib/elm_code_widget.c
@@ -32,12 +32,14 @@ Eina_Unicode status_icons[] = {
  0
 };
 
-#define EO_CONSTRUCTOR_CHECK_RETURN(obj) \
-   if (eo_do(obj, eo_finalized_get())) \
+#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
+   Eina_Bool finalized; \
+   if (eo_do_ret(obj, finalized, eo_finalized_get())) \
      { \
         ERR("This function is only allowed during construction."); \
         return; \
-     }
+     } \
+} while (0)
 
 EOLIAN static void
 _elm_code_widget_eo_base_constructor(Eo *obj, Elm_Code_Widget_Data *pd)