diff --git a/opal/mca/hwloc/hwloc191/hwloc/src/bitmap.c b/opal/mca/hwloc/hwloc191/hwloc/src/bitmap.c
index 39f4dbfe3a..2fc3b831e3 100644
--- a/opal/mca/hwloc/hwloc191/hwloc/src/bitmap.c
+++ b/opal/mca/hwloc/hwloc191/hwloc/src/bitmap.c
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2009 CNRS
- * Copyright © 2009-2011 inria.  All rights reserved.
+ * Copyright © 2009-2015 Inria.  All rights reserved.
  * Copyright © 2009-2011 Université Bordeaux 1
  * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
  * See COPYING in top-level directory.
@@ -903,7 +903,7 @@ int hwloc_bitmap_isincluded (const struct hwloc_bitmap_s *sub_set, const struct
 	HWLOC__BITMAP_CHECK(sub_set);
 	HWLOC__BITMAP_CHECK(super_set);
 
-	for(i=0; i<sub_set->ulongs_count; i++)
+	for(i=0; i<sub_set->ulongs_count || i<super_set->ulongs_count; i++)
 		if (HWLOC_SUBBITMAP_READULONG(super_set, i) != (HWLOC_SUBBITMAP_READULONG(super_set, i) | HWLOC_SUBBITMAP_READULONG(sub_set, i)))
 			return 0;