diff --git a/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java b/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
index 2c60a4ae7..194e58155 100644
--- a/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
+++ b/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
@@ -147,14 +147,19 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
 			log.trace("GL - creating GLCapabilities");
 			final GLCapabilities caps = new GLCapabilities(glp);
 			
-			log.trace("GL - setSampleBuffers");
-			caps.setSampleBuffers(true);
-			
-			log.trace("GL - setNumSamples");
-			caps.setNumSamples(6);
-			
-			log.trace("GL - Creating Canvas");
-			canvas = new GLCanvas(caps);
+			if (true) {
+				log.trace("GL - setSampleBuffers");
+				caps.setSampleBuffers(true);
+				
+				log.trace("GL - setNumSamples");
+				caps.setNumSamples(6);
+				
+				log.trace("GL - Creating GLCanvas");
+				canvas = new GLCanvas(caps);
+			} else {
+				log.trace("GL - Creating GLJPanel");
+				canvas = new GLJPanel(caps);
+			}
 			
 			log.trace("GL - Registering as GLEventListener on canvas");
 			((GLAutoDrawable) canvas).addGLEventListener(this);