diff --git a/src/TextureFetcher.cs b/src/TextureFetcher.cs
index 136a7cc..59c470f 100644
--- a/src/TextureFetcher.cs
+++ b/src/TextureFetcher.cs
@@ -129,16 +129,10 @@ namespace OpenSim.Modules.TextureFetcher
                 Primitive.TextureEntry textures = part.Shape.Textures;
                 int allSides = part.GetNumberOfSides();
 
-                foreach(TextureEntryFace face in textures.FaceTextures)
+                for(uint i = 0; i < allSides; i++)
                 {
-                    if(face != null)
-                    {
-                        if (face.TextureID != null)
-                            allTextures.Add(face.TextureID);
-
-                        if (face.MaterialID != null)
-                            allTextures.Add(face.MaterialID);
-                    }
+                    TextureEntryFace face = textures.GetFace(i);
+                    allTextures.Add(face.TextureID);
                 }
 
                 //Convert texture uuid list to inventar items.