diff --git a/Source/GSThemeDrawing.m b/Source/GSThemeDrawing.m
index 57366e8b6..7be39498a 100644
--- a/Source/GSThemeDrawing.m
+++ b/Source/GSThemeDrawing.m
@@ -562,7 +562,7 @@
   else
     {
       [image compositeToPoint: position 
-	       operation: NSCompositeSourceOver];
+	            operation: NSCompositeSourceOver];
     }
 }
 
diff --git a/Source/GSThemeTools.m b/Source/GSThemeTools.m
index 80cab3aa4..193949bb6 100644
--- a/Source/GSThemeTools.m
+++ b/Source/GSThemeTools.m
@@ -883,10 +883,15 @@ withRepeatedImage: (NSImage*)image
         }
       else
         {
+#if 0
+/* This code raises an exception on windows (tested 30/10/2009) ... why? */
           images[i]
 	    = [[self extractImageFrom: image withRect: rects[i]] retain];
           rects[i].origin.x = 0;
           rects[i].origin.y = 0;
+#else
+	  images[i] = [image retain];
+#endif
         }
     }
 }