diff --git a/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java b/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java
index b52248cbd18d07dec971f937f4f7cd446d34a2eb..a4a330652f8b254f53db40ac77b029d7428a762e 100644
--- a/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java
+++ b/examples/nbody/src/com/amd/aparapi/examples/nbody/Main.java
@@ -63,6 +63,7 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
+import javax.swing.WindowConstants;
 
 import com.amd.aparapi.Kernel;
 import com.amd.aparapi.ProfileInfo;
@@ -347,27 +348,8 @@ public class Main{
       panel.add(canvas, BorderLayout.CENTER);
       frame.getContentPane().add(panel, BorderLayout.CENTER);
       final FPSAnimator animator = new FPSAnimator(canvas, 100);
-      frame.addWindowListener(new WindowAdapter(){
-
-         @Override public void windowClosed(WindowEvent e) {
-            System.out.println("closed");
-            animator.stop();
-            GLProfile.shutdown();
-            System.exit(1);
-
-         }
-
-         @Override public void windowClosing(WindowEvent e) {
-            System.out.println("closing");
-            animator.stop();
-            GLProfile.shutdown();
-            //  System.exit(1);
-
-         }
-
-      });
-
-      //frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+    
+      frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
       frame.pack();
       frame.setVisible(true);