1 files changed, 9 insertions, 5 deletions
diff --git a/src/fltk-widgets-valuators-value_outputs.adb b/src/fltk-widgets-valuators-value_outputs.adb
index 970d7e1..e677850 100644
--- a/src/fltk-widgets-valuators-value_outputs.adb
+++ b/src/fltk-widgets-valuators-value_outputs.adb
@@ -113,16 +113,20 @@ package body FLTK.Widgets.Valuators.Value_Outputs is
 
 
 
+    procedure Extra_Final
+           (This : in out Value_Output) is
+    begin
+        Extra_Final (Valuator (This));
+    end Extra_Final;
+
+
     procedure Finalize
            (This : in out Value_Output) is
     begin
-        if  This.Void_Ptr /= Null_Pointer and then
-            This in Value_Output'Class
-        then
+        Extra_Final (This);
+        if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
             free_fl_value_output (This.Void_Ptr);
-            This.Void_Ptr := Null_Pointer;
         end if;
-        Finalize (Valuator (This));
     end Finalize;