diff --git a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java
index 7a284249..d22821c7 100644
--- a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java
+++ b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java
@@ -183,24 +183,31 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
 
                         case VALUE_PASSMODE:
                             int pChangingElement = getNextChangingElement(index, white) + 1;
-                            if(pChangingElement >= changesReferenceRowCount || pChangingElement == -1){
+
+                            if (pChangingElement >= changesReferenceRowCount || pChangingElement == -1) {
                                 index = columns;
-                            }else{
+                            }
+                            else {
                                 index = changesReferenceRow[pChangingElement];
                             }
+
                             break;
 
                         default:
                             // Vertical mode (-3 to 3)
                             int vChangingElement = getNextChangingElement(index, white);
-                            if(vChangingElement >= changesReferenceRowCount || vChangingElement == -1){
+
+                            if (vChangingElement >= changesReferenceRowCount || vChangingElement == -1) {
                                 index = columns + n.value;
-                            }else{
-                                index = changesReferenceRow[vChangingElement]+ n.value;
                             }
+                            else {
+                                index = changesReferenceRow[vChangingElement] + n.value;
+                            }
+
                             changesCurrentRow[changesCurrentRowCount] = index;
                             changesCurrentRowCount++;
                             white = !white;
+
                             break;
                     }
 
diff --git a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
index 60c50ec3..b41b6d96 100644
--- a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
+++ b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
@@ -80,7 +80,15 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
                 new TestData(getClassLoaderResource("/tiff/lzw-long-strings-sample.tif"), new Dimension(316, 173)), // RGBA, LZW compressed w/predictor
                 new TestData(getClassLoaderResource("/tiff/part.tif"), new Dimension(50, 50)), // Gray/BlackIsZero, uncompressed, striped signed int (SampleFormat 2)
                 new TestData(getClassLoaderResource("/tiff/cmyk_jpeg_no_profile.tif"), new Dimension(150, 63)), // CMYK, JPEG compressed, no ICC profile
-                new TestData(getClassLoaderResource("/tiff/cmyk_jpeg.tif"), new Dimension(100, 100)) // CMYK, JPEG compressed, with ICC profile
+                new TestData(getClassLoaderResource("/tiff/cmyk_jpeg.tif"), new Dimension(100, 100)), // CMYK, JPEG compressed, with ICC profile
+                // CCITT
+                new TestData(getClassLoaderResource("/tiff/ccitt/group3_1d.tif"), new Dimension(6, 4)), // B/W, CCITT T4 1D
+                new TestData(getClassLoaderResource("/tiff/ccitt/group3_1d_fill.tif"), new Dimension(6, 4)), // B/W, CCITT T4 1D
+                new TestData(getClassLoaderResource("/tiff/ccitt/group3_2d.tif"), new Dimension(6, 4)), // B/W, CCITT T4 2D
+                new TestData(getClassLoaderResource("/tiff/ccitt/group3_2d_fill.tif"), new Dimension(6, 4)), // B/W, CCITT T4 2D
+                new TestData(getClassLoaderResource("/tiff/ccitt/group3_2d_lsb2msb.tif"), new Dimension(6, 4)), // B/W, CCITT T4 2D, LSB
+                new TestData(getClassLoaderResource("/tiff/ccitt/group4.tif"), new Dimension(6, 4)), // B/W, CCITT T6 1D
+                new TestData(getClassLoaderResource("/tiff/fivepages-scan-causingerrors.tif"), new Dimension(2480, 3518)) // B/W, CCITT T4
         );
     }
 
diff --git a/imageio/imageio-tiff/src/test/resources/tiff/fivepages-scan-causingerrors.tif b/imageio/imageio-tiff/src/test/resources/tiff/fivepages-scan-causingerrors.tif
new file mode 100644
index 00000000..1e3dc912
Binary files /dev/null and b/imageio/imageio-tiff/src/test/resources/tiff/fivepages-scan-causingerrors.tif differ