diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java
index 36d4b48d..3c25013d 100755
--- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java
+++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java
@@ -30,12 +30,11 @@
 
 package com.twelvemonkeys.imageio.plugins.iff;
 
+import javax.imageio.IIOException;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.imageio.IIOException;
-
 /**
  * BMHDChunk
  *
@@ -110,11 +109,11 @@ final class BMHDChunk extends IFFChunk {
     int pageWidth;
     int pageHeight;
 
-    protected BMHDChunk(int pChunkLength) {
+    BMHDChunk(int pChunkLength) {
         super(IFF.CHUNK_BMHD, pChunkLength);
     }
 
-    protected BMHDChunk(int pWidth, int pHeight, int pBitplanes, int pMaskType, int pCompressionType, int pTransparentIndex) {
+    BMHDChunk(int pWidth, int pHeight, int pBitplanes, int pMaskType, int pCompressionType, int pTransparentIndex) {
         super(IFF.CHUNK_BMHD, 20);
         width = pWidth;
         height = pHeight;
diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java
index e5b5aec6..3febed79 100755
--- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java
+++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java
@@ -40,7 +40,7 @@ import java.io.DataOutput;
  * @version $Id: BODYChunk.java,v 1.0 28.feb.2006 01:25:49 haku Exp$
  */
 final class BODYChunk extends IFFChunk {
-    protected BODYChunk(int pChunkLength) {
+    BODYChunk(int pChunkLength) {
         super(IFF.CHUNK_BODY, pChunkLength);
     }
 
diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java
index 05137874..12ce0766 100755
--- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java
+++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java
@@ -30,12 +30,11 @@
 
 package com.twelvemonkeys.imageio.plugins.iff;
 
+import javax.imageio.IIOException;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-import javax.imageio.IIOException;
-
 /**
  * CAMGChunk
  *
@@ -49,7 +48,7 @@ final class CAMGChunk extends IFFChunk {
 
     int camg;
 
-    public CAMGChunk(int pLength) {
+    CAMGChunk(int pLength) {
         super(IFF.CHUNK_CAMG, pLength);
     }
 
diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java
index 82215afb..b015c71e 100755
--- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java
+++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java
@@ -30,6 +30,7 @@
 
 package com.twelvemonkeys.imageio.plugins.iff;
 
+import javax.imageio.IIOException;
 import java.awt.image.BufferedImage;
 import java.awt.image.IndexColorModel;
 import java.awt.image.WritableRaster;
@@ -38,8 +39,6 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Arrays;
 
-import javax.imageio.IIOException;
-
 /**
  * CMAPChunk
  *
@@ -60,7 +59,7 @@ final class CMAPChunk extends IFFChunk {
 
     private IndexColorModel model;
 
-    protected CMAPChunk(final int pChunkLength) {
+    CMAPChunk(final int pChunkLength) {
         super(IFF.CHUNK_CMAP, pChunkLength);
     }
 
@@ -162,7 +161,8 @@ final class CMAPChunk extends IFFChunk {
             // with alpha, where all colors above the original color is all transparent?
             // This is a waste of time and space, of course...
             int transparent = header.maskType == BMHDChunk.MASK_TRANSPARENT_COLOR ? header.transparentIndex : -1;
-            model = new IndexColorModel(header.bitplanes, reds.length, reds, greens, blues, transparent); // https://github.com/haraldk/TwelveMonkeys/issues/15
+            int bitplanes = header.bitplanes == 25 ? 8 : header.bitplanes;
+            model = new IndexColorModel(bitplanes, reds.length, reds, greens, blues, transparent); // https://github.com/haraldk/TwelveMonkeys/issues/15
         }
 
         return model;
diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CTBLChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CTBLChunk.java
index 6e458cd6..74e917d4 100644
--- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CTBLChunk.java
+++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CTBLChunk.java
@@ -38,7 +38,7 @@ package com.twelvemonkeys.imageio.plugins.iff;
  * @version $Id: CTBLChunk.java,v 1.0 30.03.12 14:53 haraldk Exp$
  */
 final class CTBLChunk extends AbstractMultiPaletteChunk {
-    protected CTBLChunk(int pChunkLength) {
+    CTBLChunk(int pChunkLength) {
         super(IFF.CHUNK_CTBL, pChunkLength);
     }
 }
diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java
index 06dc1482..dab83a5d 100755
--- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java
+++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java
@@ -50,11 +50,11 @@ final class GRABChunk extends IFFChunk {
 
     Point2D point;
 
-    protected GRABChunk(int pChunkLength) {
+    GRABChunk(int pChunkLength) {
         super(IFF.CHUNK_GRAB, pChunkLength);
     }
 
-    protected GRABChunk(Point2D pPoint) {
+    GRABChunk(Point2D pPoint) {
         super(IFF.CHUNK_GRAB, 4);
         point = pPoint;
     }
diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/PCHGChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/PCHGChunk.java
index 51511882..fe8d52f3 100644
--- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/PCHGChunk.java
+++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/PCHGChunk.java
@@ -72,7 +72,7 @@ final class PCHGChunk extends AbstractMultiPaletteChunk {
     private int totalChanges;
     private int minReg;
 
-    public PCHGChunk(int pChunkLength) {
+    PCHGChunk(int pChunkLength) {
         super(IFF.CHUNK_PCHG, pChunkLength);
     }
 
diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/SHAMChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/SHAMChunk.java
index 5fa3c9fb..471c7009 100644
--- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/SHAMChunk.java
+++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/SHAMChunk.java
@@ -38,7 +38,7 @@ package com.twelvemonkeys.imageio.plugins.iff;
  * @version $Id: SHAMChunk.java,v 1.0 30.03.12 14:53 haraldk Exp$
  */
 final class SHAMChunk extends AbstractMultiPaletteChunk {
-    protected SHAMChunk(int pChunkLength) {
+    SHAMChunk(int pChunkLength) {
         super(IFF.CHUNK_SHAM, pChunkLength);
     }