diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
index e36ee6dbf..b99e3b121 100644
--- a/src/graphics/irr_driver.cpp
+++ b/src/graphics/irr_driver.cpp
@@ -177,7 +177,13 @@ void IrrDriver::initDevice()
         
 #if (IRRLICHT_VERSION_MAJOR == 1) && (IRRLICHT_VERSION_MINOR >= 7)
     video::SMaterial& material2D = m_video_driver->getMaterial2D();
-    material2D.TextureLayer[0].BilinearFilter=true;
+    for (int n=0; n<MATERIAL_MAX_TEXTURES; n++)
+    {
+        material2D.TextureLayer[n].BilinearFilter = true;
+        //material2D.TextureLayer[n].TextureWrap = ETC_CLAMP_TO_EDGE;
+        material2D.TextureLayer[n].TextureWrapU = ETC_CLAMP_TO_EDGE;
+        material2D.TextureLayer[n].TextureWrapV = ETC_CLAMP_TO_EDGE;
+    }
     material2D.AntiAliasing=video::EAAM_FULL_BASIC;
     //m_video_driver->enableMaterial2D();
 #endif