diff --git a/Rendering/Core/Testing/Cxx/TestCompositePolyDataMapper2Picking.cxx b/Rendering/Core/Testing/Cxx/TestCompositePolyDataMapper2Picking.cxx
index 31a59e2d1faeddfffebfec3111f581c8af8d01d9..0ee9d7e9ac98abf091c30fba91091b64b5901b4c 100644
--- a/Rendering/Core/Testing/Cxx/TestCompositePolyDataMapper2Picking.cxx
+++ b/Rendering/Core/Testing/Cxx/TestCompositePolyDataMapper2Picking.cxx
@@ -313,7 +313,7 @@ int TestCompositePolyDataMapper2Picking(int argc, char* argv[])
       bPrims.find(48) == bPrims.end() ||
       std::find(bPrims[48].begin(), bPrims[48].end(), 14) == bPrims[48].end() ||
       bPrims.find(97) == bPrims.end() ||
-      std::find(bPrims[97].begin(), bPrims[97].end(), 42) == bPrims[97].end()
+      std::find(bPrims[82].begin(), bPrims[82].end(), 114) == bPrims[82].end()
       )
     {
     cerr << "Incorrect pick results (if any picks were performed inter"
diff --git a/Rendering/OpenGL2/vtkCompositePolyDataMapper2.cxx b/Rendering/OpenGL2/vtkCompositePolyDataMapper2.cxx
index 66fbe7790e577d48f5afc9b264a1edbf0a0f7cbc..338148998df21c3bfe6c4b6de2a617192082b6c4 100644
--- a/Rendering/OpenGL2/vtkCompositePolyDataMapper2.cxx
+++ b/Rendering/OpenGL2/vtkCompositePolyDataMapper2.cxx
@@ -84,7 +84,8 @@ public:
       this->OverridesColor != next->OverridesColor ||
       this->AmbientColor != next->AmbientColor ||
       this->DiffuseColor != next->DiffuseColor ||
-      (primType >= 0 && this->PrimOffsets[primType+1] != next->PrimOffsets[primType]);
+      (primType >= 0 && primType <= 3 &&
+        this->PrimOffsets[primType+1] != next->PrimOffsets[primType]);
     }
 
 };