diff --git a/examples/ThirdPartyLibs/glad/glad_glx.c b/examples/ThirdPartyLibs/glad/glad_glx.c
index 3509b47a7..d1f346365 100644
--- a/examples/ThirdPartyLibs/glad/glad_glx.c
+++ b/examples/ThirdPartyLibs/glad/glad_glx.c
@@ -190,7 +190,7 @@ int gladLoadGLX(Display *dpy, int screen) {
 
     if(open_gl()) {
         status = gladLoadGLXLoader((GLADloadproc)get_proc, dpy, screen);
-        close_gl();
+        //close_gl();
     }
 
     return status;
@@ -777,13 +777,6 @@ static int find_extensionsGLX(void) {
 
 static void find_coreGLX(Display *dpy, int screen) {
 	int major = 0, minor = 0;
-	if(dpy == 0 && GLADGLXDisplay == 0) {
-		dpy = XOpenDisplay(0);
-		screen = XScreenNumberOfScreen(XDefaultScreenOfDisplay(dpy));
-	} else if(dpy == 0) {
-		dpy = GLADGLXDisplay;
-		screen = GLADGLXscreen;
-	}
 	glXQueryVersion(dpy, &major, &minor);
 	GLADGLXDisplay = dpy;
 	GLADGLXscreen = screen;
diff --git a/setup.py b/setup.py
index e553704e3..9f44e8bd1 100644
--- a/setup.py
+++ b/setup.py
@@ -388,7 +388,8 @@ if _platform == "linux" or _platform == "linux2":
     CXX_FLAGS += '-fno-inline-functions-called-once'
     sources = sources + ["examples/ThirdPartyLibs/enet/unix.c"]\
     +["examples/OpenGLWindow/X11OpenGLWindow.cpp"]\
-    +["examples/ThirdPartyLibs/glad/glad.c"]
+    +["examples/ThirdPartyLibs/glad/glad.c"]\
+    +["examples/ThirdPartyLibs/glad/glad_glx.c"]
     include_dirs += ["examples/ThirdPartyLibs/optionalX11"]
 elif _platform == "win32":
     print("win32!")