diff --git a/lib/redistat.rb b/lib/redistat.rb
index 3258d7a..68b7bd8 100644
--- a/lib/redistat.rb
+++ b/lib/redistat.rb
@@ -96,11 +96,7 @@ def group_separator
     end
     attr_writer :group_separator
 
-  end
-end
+    ObjectSpace.define_finalizer(self, proc { Redistat.buffer.flush (true) })
 
-
-# ensure buffer is flushed on program exit
-Kernel.at_exit do
-  Redistat.buffer.flush(true)
+  end
 end