diff --git a/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java b/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
index 7fdab9bd669f52e00d6e09dd22c00424a0b3a98d..89578cc32c2b90ce9f3a92aaffb738ae1397247d 100644
--- a/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
+++ b/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java
@@ -383,7 +383,8 @@ class LCMSImageLayout {
     }
     public static LCMSImageLayout createImageLayout(Raster r) {
         LCMSImageLayout l = new LCMSImageLayout();
-        if (r instanceof ByteComponentRaster) {
+        if (r instanceof ByteComponentRaster &&
+                r.getSampleModel() instanceof ComponentSampleModel) {
             ByteComponentRaster br = (ByteComponentRaster)r;
 
             ComponentSampleModel csm = (ComponentSampleModel)r.getSampleModel();
diff --git a/test/sun/awt/image/bug8038000.java b/test/sun/awt/image/bug8038000.java
index 2bfdc27d2b7de54e58d9db2e821b9ab1bb06ec2b..20affe806c217b8c83ae3926505075d0dff5d40c 100644
--- a/test/sun/awt/image/bug8038000.java
+++ b/test/sun/awt/image/bug8038000.java
@@ -23,11 +23,13 @@
 
 /**
  * @test
- * @bug     8038000
+ * @bug     8038000 8047066
  *
  * @summary Verifies that we could create different type of Rasters with height 1
  * and strideline which exceeds raster width.
  * Also checks that a set of RasterOp work correctly with such kind of Rasters.
+ * For 8047066 verifies that ColorConvertOp could process
+ * Raster (ByteBuffer + SinglePixelPackedSampleModel)
  *
  * @run     main bug8038000
  */