diff --git a/src/EC/Bitset.hpp b/src/EC/Bitset.hpp
index 6ddd1d3..f95470d 100644
--- a/src/EC/Bitset.hpp
+++ b/src/EC/Bitset.hpp
@@ -4,6 +4,7 @@
 
 #include <bitset>
 #include "Meta/TypeList.hpp"
+#include "Meta/Combine.hpp"
 
 namespace EC
 {
@@ -11,16 +12,18 @@ namespace EC
     struct Bitset :
         public std::bitset<ComponentsList::size + TagsList::size>
     {
+        using Combined = EC::Meta::Combine<ComponentsList, TagsList>;
+
         template <typename Component>
         constexpr auto getComponentBit()
         {
-            return (*this)[EC::Meta::IndexOf<Component, ComponentsList>::value];
+            return (*this)[EC::Meta::IndexOf<Component, Combined>::value];
         }
 
         template <typename Tag>
         constexpr auto getTagBit()
         {
-            return (*this)[ComponentsList::size + EC::Meta::IndexOf<Tag, TagsList>::value];
+            return (*this)[EC::Meta::IndexOf<Tag, Combined>::value];
         }
     };
 }