diff --git a/JavaApp/src/main/java/org/lwjgl/opengl/GL.java b/JavaApp/src/main/java/org/lwjgl/opengl/GL.java
index f9b4b7d2..2f8f8501 100644
--- a/JavaApp/src/main/java/org/lwjgl/opengl/GL.java
+++ b/JavaApp/src/main/java/org/lwjgl/opengl/GL.java
@@ -132,7 +132,18 @@ public final class GL {
 
         @Override
         public long getFunctionAddress(ByteBuffer functionName) {
-            long address = getExtensionAddress(memAddress(functionName));
+            long address = NULL;
+        
+            // Try locate GL4ES function first
+            String funcName = memASCII(functionName);
+            if (!funcName.startsWith("gl4es_gl")) {
+                address = getFunctionAddress("gl4es_" + funcName);
+                System.out.println(funcName + " = " + address);
+            }
+        
+            if (address == NULL) {
+                address = getExtensionAddress(memAddress(functionName));
+            }
             if (address == NULL) {
                 address = library.getFunctionAddress(functionName);
                 if (address == NULL && DEBUG_FUNCTIONS) {
@@ -186,11 +197,6 @@ public final class GL {
                         long getExtensionAddress(long name) {
                             return gl4es_GetProcAddress == NULL ? NULL : callPP(name, gl4es_GetProcAddress);
                         }
-                        
-                        @Override
-                        long getFunctionAddress(CharSequence functionName) {
-                            return super.getFunctionAddress("gl4es_" + name);
-                        }
                     };
                     break;
                 default: