diff --git a/examples/core_oculus_rift.c b/examples/core_oculus_rift.c
index 131a21c2..734ba8fd 100644
--- a/examples/core_oculus_rift.c
+++ b/examples/core_oculus_rift.c
@@ -52,6 +52,8 @@ int main()
         BeginDrawing();
 
             ClearBackground(RAYWHITE);
+            
+            if (IsOculusReady()) BeginOculusDrawing();
 
             Begin3dMode(camera);
 
@@ -62,6 +64,8 @@ int main()
             
             End3dMode();
             
+            if (IsOculusReady()) EndOculusDrawing();
+            
             DrawFPS(10, 10);
 
         EndDrawing();
diff --git a/src/core.c b/src/core.c
index a8557831..f8a83e25 100644
--- a/src/core.c
+++ b/src/core.c
@@ -521,7 +521,7 @@ void BeginDrawing(void)
     updateTime = currentTime - previousTime;
     previousTime = currentTime;
     
-    if (IsOculusReady()) BeginOculusDrawing();
+    //if (IsOculusReady()) BeginOculusDrawing();
 
     rlClearScreenBuffers();             // Clear current framebuffers
     rlLoadIdentity();                   // Reset current matrix (MODELVIEW)
@@ -536,7 +536,7 @@ void EndDrawing(void)
 {
     rlglDraw();                     // Draw Buffers (Only OpenGL 3+ and ES2)
     
-    if (IsOculusReady()) EndOculusDrawing();
+    //if (IsOculusReady()) EndOculusDrawing();
 
     SwapBuffers();                  // Copy back buffer to front buffer
     PollInputEvents();              // Poll user events
@@ -2675,7 +2675,7 @@ static void *MouseThread(void *arg)
     int mouseRelX = 0;
     int mouseRelY = 0;
 
-    while (1)
+    while (!windowShouldClose)
     {
         if (read(mouseStream, &mouse, sizeof(MouseEvent)) == (int)sizeof(MouseEvent))
         {