diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp
index 9dff711731..648beebfb0 100644
--- a/indexer/classificator.cpp
+++ b/indexer/classificator.cpp
@@ -122,8 +122,7 @@ void ClassifObject::ConcatChildNames(string & s) const
 
 Classificator & classif(MapStyle mapStyle)
 {
-  int const index = static_cast<int>(mapStyle);
-  ASSERT_GREATER_OR_EQUAL(index, 0, ());
+  size_t const index = static_cast<size_t>(mapStyle);
   ASSERT_LESS(index, MapStyleCount, ());
   static Classificator c[MapStyleCount];
   return c[index];
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index ca8f34058d..ef9d8fe717 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -48,7 +48,7 @@ namespace classificator
 
     MapStyle const originMapStyle = GetStyleReader().GetCurrentStyle();
 
-    for (int i = 0; i < MapStyleCount; ++i)
+    for (size_t i = 0; i < MapStyleCount; ++i)
     {
       MapStyle const mapStyle = static_cast<MapStyle>(i);
       GetStyleReader().SetCurrentStyle(mapStyle);
diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 8b81b75b07..06b1aef206 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -187,8 +187,7 @@ void RulesHolder::ResizeCaches(size_t s)
 
 RulesHolder & rules(MapStyle mapStyle)
 {
-  int const index = static_cast<int>(mapStyle);
-  ASSERT_GREATER_OR_EQUAL(index, 0, ());
+  size_t const index = static_cast<size_t>(mapStyle);
   ASSERT_LESS(index, MapStyleCount, ());
   static RulesHolder h[MapStyleCount];
   return h[index];