diff --git a/include/bx/bitarray.h b/include/bx/bitarray.h
index 74e8c12..fda3334 100644
--- a/include/bx/bitarray.h
+++ b/include/bx/bitarray.h
@@ -31,14 +31,14 @@ namespace bx
 		bool isDone() const;
 
 		/// Returns index of the current set bit.
-		uint32_t getIndex() const;
+		uint8_t getIndex() const;
 
 		/// Returns remaining mask, shifted so that the current set bit is bit 0.
 		MaskT getMask() const;
 
 	private:
-		MaskT    m_mask;
-		uint32_t m_idx;
+		MaskT   m_mask;
+		uint8_t m_idx;
 	};
 
 	/// Range-for iterator over set bits of a bit array, in index order. Dereferences to the bit
diff --git a/include/bx/inline/bitarray.inl b/include/bx/inline/bitarray.inl
index ef90d83..b102d79 100644
--- a/include/bx/inline/bitarray.inl
+++ b/include/bx/inline/bitarray.inl
@@ -91,7 +91,7 @@ namespace bx
 	}
 
 	template<typename MaskT>
-	inline uint32_t BitMaskToIndexIteratorT<MaskT>::getIndex() const
+	inline uint8_t BitMaskToIndexIteratorT<MaskT>::getIndex() const
 	{
 		return m_idx;
 	}