diff --git a/Source/com/drew/metadata/exif/ExifTiffHandler.java b/Source/com/drew/metadata/exif/ExifTiffHandler.java
index <HASH>..<HASH> 100644
--- a/Source/com/drew/metadata/exif/ExifTiffHandler.java
+++ b/Source/com/drew/metadata/exif/ExifTiffHandler.java
@@ -84,6 +84,11 @@ public class ExifTiffHandler extends DirectoryTiffHandler
             pushDirectory(ExifThumbnailDirectory.class);
             return true;
         }
+
+        // The Canon EOS 7D (CR2) has three chained/following thumbnail IFDs
+        if (_currentDirectory instanceof ExifThumbnailDirectory)
+            return true;
+
         // This should not happen, as Exif doesn't use follower IFDs apart from that above.
         // NOTE have seen the CanonMakernoteDirectory IFD have a follower pointer, but it points to invalid data.
         return false;
Fix regression in Canon EOS 7D (CR2) where 3 thumbnail IFDs are chained.