diff --git a/src/libEGL/Surface.cpp b/src/libEGL/Surface.cpp
index f58f07a..d1e7eec 100644
--- a/src/libEGL/Surface.cpp
+++ b/src/libEGL/Surface.cpp
@@ -146,6 +146,9 @@
         mDisplay->startScene();
         device->DrawPrimitiveUP(D3DPT_TRIANGLEFAN, 2, quad, 6 * sizeof(float));
 
+        textureSurface->Release();
+        texture->Release();
+
         mDisplay->endScene();
         result = mSwapChain->Present(NULL, NULL, NULL, NULL, D3DPRESENT_INTERVAL_IMMEDIATE | D3DPRESENT_DONOTWAIT);   // FIXME: Get the swap interval from the associated Display
 
@@ -153,9 +156,6 @@
         {
             return error(EGL_BAD_ALLOC);
         }
-
-        textureSurface->Release();
-        texture->Release();
     }
 }
 
diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index 2257c03..af5b1d7 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -550,7 +550,7 @@
     }
     else
     {
-        getRenderTarget(GL_TEXTURE_2D);
+        needRenderTarget();
     }
 
     RECT sourceRect;