diff --git a/Source/NSBitmapImageRep.m b/Source/NSBitmapImageRep.m
index 1f5d0c45c..4bf0c689c 100644
--- a/Source/NSBitmapImageRep.m
+++ b/Source/NSBitmapImageRep.m
@@ -624,13 +624,16 @@
       NSLog(@"Extension missing from filename - '%@'", filename);
       return nil;
     }
-
-  if ([[self imageUnfilteredFileTypes] indexOfObject: ext] != NSNotFound)
+  /* This is a quick hack to make it work - if the extension is that
+     of a tiff file, we init with data */
+  if ([ext isEqualToString: @"tiff"]  ||  [ext isEqualToString: @"tif"])
     {
       NSData* data = [NSData dataWithContentsOfFile: filename];
       return [self imageRepsWithData: data];
     }
 
+  /* Otherwise, we attempt using wraster classes to load the file
+     (which could be png, etc) */
   array = [NSMutableArray arrayWithCapacity: 2];
   images = 0;
   do