diff --git a/src/java/org/lwjgl/opengl/GLWindow.java b/src/java/org/lwjgl/opengl/GLWindow.java
index 6723e478..f2f32d89 100644
--- a/src/java/org/lwjgl/opengl/GLWindow.java
+++ b/src/java/org/lwjgl/opengl/GLWindow.java
@@ -243,7 +243,7 @@ public class GLWindow extends Window {
 	 * Checks and sets WGL_EXT_extensions_string and WGL_ARB_extensions_string
 	 * if available.
 	 */
-	private static native void checkWGLExtensionsString();
+	private native void checkWGLExtensionsString();
 
 	/**
 	 * Determine which WGL extensions are available
diff --git a/src/native/common/org_lwjgl_opengl_GLWindow.h b/src/native/common/org_lwjgl_opengl_GLWindow.h
index c76403bd..cc29c558 100644
--- a/src/native/common/org_lwjgl_opengl_GLWindow.h
+++ b/src/native/common/org_lwjgl_opengl_GLWindow.h
@@ -10,13 +10,6 @@ extern "C" {
 /* Inaccessible static: _00024assertionsDisabled */
 /* Inaccessible static: currentWindow */
 /* Inaccessible static: class_00024org_00024lwjgl_00024Window */
-/* Inaccessible static: WGL_ARB_buffer_region */
-/* Inaccessible static: WGL_ARB_extensions_string */
-/* Inaccessible static: WGL_ARB_pbuffer */
-/* Inaccessible static: WGL_ARB_pixel_format */
-/* Inaccessible static: WGL_ARB_render_texture */
-/* Inaccessible static: WGL_EXT_extensions_string */
-/* Inaccessible static: WGL_EXT_swap_control */
 /* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024GL */
 /*
  * Class:     org_lwjgl_opengl_GLWindow
@@ -24,7 +17,7 @@ extern "C" {
  * Signature: ()V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString
-  (JNIEnv *, jclass);
+  (JNIEnv *, jobject);
 
 /*
  * Class:     org_lwjgl_opengl_GLWindow
diff --git a/src/native/linux/org_lwjgl_opengl_GLWindow.cpp b/src/native/linux/org_lwjgl_opengl_GLWindow.cpp
index ba3419ae..e82c0f6e 100644
--- a/src/native/linux/org_lwjgl_opengl_GLWindow.cpp
+++ b/src/native/linux/org_lwjgl_opengl_GLWindow.cpp
@@ -259,12 +259,13 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_nCreate
  * Class:     org_lwjgl_opengl_GL
  * Method:    checkWGLExtensionsString
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString(JNIEnv * env, jobject obj)
 {
-	jfieldID fid_WGL_ARB_extensions_string = env->GetStaticFieldID(clazz, "WGL_ARB_extensions_string", "Z");
-	jfieldID fid_WGL_EXT_extensions_string = env->GetStaticFieldID(clazz, "WGL_EXT_extensions_string", "Z");
-	env->SetStaticBooleanField(clazz, fid_WGL_ARB_extensions_string, JNI_FALSE);
-	env->SetStaticBooleanField(clazz, fid_WGL_EXT_extensions_string, JNI_FALSE);
+	jclass clazz = env->GetObjectClass(obj);
+	jfieldID fid_WGL_ARB_extensions_string = env->GetFieldID(clazz, "WGL_ARB_extensions_string", "Z");
+	jfieldID fid_WGL_EXT_extensions_string = env->GetFieldID(clazz, "WGL_EXT_extensions_string", "Z");
+	env->SetBooleanField(obj, fid_WGL_ARB_extensions_string, JNI_FALSE);
+	env->SetBooleanField(obj, fid_WGL_EXT_extensions_string, JNI_FALSE);
 }
 
 /*
diff --git a/src/native/win32/org_lwjgl_opengl_GLWindow.cpp b/src/native/win32/org_lwjgl_opengl_GLWindow.cpp
index 27d32dc7..f200b6c3 100644
--- a/src/native/win32/org_lwjgl_opengl_GLWindow.cpp
+++ b/src/native/win32/org_lwjgl_opengl_GLWindow.cpp
@@ -210,14 +210,15 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_nDestroyGL
  * Class:     org_lwjgl_opengl_GL
  * Method:    checkWGLExtensionsString
  */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GLWindow_checkWGLExtensionsString(JNIEnv * env, jobject obj)
 {
-	jfieldID fid_WGL_ARB_extensions_string = env->GetStaticFieldID(clazz, "WGL_ARB_extensions_string", "Z");
-	jfieldID fid_WGL_EXT_extensions_string = env->GetStaticFieldID(clazz, "WGL_EXT_extensions_string", "Z");
+	jclass clazz = env->GetObjectClass(obj);
+	jfieldID fid_WGL_ARB_extensions_string = env->GetFieldID(clazz, "WGL_ARB_extensions_string", "Z");
+	jfieldID fid_WGL_EXT_extensions_string = env->GetFieldID(clazz, "WGL_EXT_extensions_string", "Z");
 	if (wglGetExtensionsStringARB)
-		env->SetStaticBooleanField(clazz, fid_WGL_ARB_extensions_string, JNI_TRUE);
+		env->SetBooleanField(obj, fid_WGL_ARB_extensions_string, JNI_TRUE);
 	if (wglGetExtensionsStringEXT)
-		env->SetStaticBooleanField(clazz, fid_WGL_EXT_extensions_string, JNI_TRUE);
+		env->SetBooleanField(obj, fid_WGL_EXT_extensions_string, JNI_TRUE);
 }
 
 /*