diff --git a/src/gl/models/gl_models.cpp b/src/gl/models/gl_models.cpp
index a59666d049..39668cd021 100644
--- a/src/gl/models/gl_models.cpp
+++ b/src/gl/models/gl_models.cpp
@@ -78,7 +78,7 @@ class DeletingModelArray : public TArray<FModel *>
 {
 public:
 
-#if 0
+#if 1
 	~DeletingModelArray()
 	{
 		for(unsigned i=0;i<Size();i++)
diff --git a/src/gl/textures/gl_material.cpp b/src/gl/textures/gl_material.cpp
index ebfcbc002f..62c860705b 100644
--- a/src/gl/textures/gl_material.cpp
+++ b/src/gl/textures/gl_material.cpp
@@ -420,8 +420,8 @@ const FHardwareTexture *FGLTexture::Bind(int texunit, int cm, int clampmode, int
 			hwtex = CreateTexture(clampmode);
 		}
 
-		// Texture has become invalid
-		else if ((warp == 0 && !tex->bHasCanvas) && tex->CheckModified())
+		// Texture has become invalid - this is only for special textures, not the regular warping, which is handled above
+		else if ((warp == 0 && !tex->bHasCanvas && !tex->bWarped) && tex->CheckModified())
 		{
 			Clean(true);
 			hwtex = CreateTexture(clampmode);
@@ -480,8 +480,8 @@ const FHardwareTexture * FGLTexture::BindPatch(int texunit, int cm, int translat
 			CreatePatch();
 		}
 
-		// Texture has become invalid
-		else if ((warp == 0 && !tex->bHasCanvas) && tex->CheckModified())
+		// Texture has become invalid - this is only for special textures, not the regular warping, which is handled above
+		else if ((warp == 0 && !tex->bHasCanvas && !tex->bWarped) && tex->CheckModified())
 		{
 			Clean(true);
 			CreatePatch();