diff --git a/indexer/point_to_int64.cpp b/indexer/point_to_int64.cpp
index 99848dc48a..70018646bc 100644
--- a/indexer/point_to_int64.cpp
+++ b/indexer/point_to_int64.cpp
@@ -18,25 +18,25 @@ inline double CoordSize(uint32_t coordBits) { return (1 << coordBits); }
 
 }
 
-m2::PointU PointD2PointU(CoordT x, CoordT y)
+m2::PointU PointD2PointU(CoordT x, CoordT y, uint32_t coordBits)
 {
   x = my::clamp(x, MercatorBounds::minX, MercatorBounds::maxX);
   y = my::clamp(y, MercatorBounds::minY, MercatorBounds::maxY);
 
   uint32_t const ix = static_cast<uint32_t>(0.5 + (x - MercatorBounds::minX)
-                         / (MercatorBounds::maxX - MercatorBounds::minX) * CoordSize());
+                         / (MercatorBounds::maxX - MercatorBounds::minX) * CoordSize(coordBits));
   uint32_t const iy = static_cast<uint32_t>(0.5 + (y - MercatorBounds::minY)
-                         / (MercatorBounds::maxY - MercatorBounds::minY) * CoordSize());
+                         / (MercatorBounds::maxY - MercatorBounds::minY) * CoordSize(coordBits));
 
-  ASSERT_LESS_OR_EQUAL(ix, CoordSize(), ());
-  ASSERT_LESS_OR_EQUAL(iy, CoordSize(), ());
+  ASSERT_LESS_OR_EQUAL(ix, CoordSize(coordBits), ());
+  ASSERT_LESS_OR_EQUAL(iy, CoordSize(coordBits), ());
 
   return m2::PointU(ix, iy);
 }
 
-int64_t PointToInt64(CoordT x, CoordT y)
+int64_t PointToInt64(CoordT x, CoordT y, uint32_t coordBits)
 {
-  int64_t const res =  static_cast<int64_t>(m2::PointUToUint64(PointD2PointU(x, y)));
+  int64_t const res =  static_cast<int64_t>(m2::PointUToUint64(PointD2PointU(x, y, coordBits)));
 
   ASSERT_LESS_OR_EQUAL(res, 3ULL << 2 * POINT_COORD_BITS, ());
   ASSERT_GREATER_OR_EQUAL(res, 0,
@@ -44,31 +44,31 @@ int64_t PointToInt64(CoordT x, CoordT y)
   return res;
 }
 
-CoordPointT PointU2PointD(m2::PointU const & pt)
+CoordPointT PointU2PointD(m2::PointU const & pt, uint32_t coordBits)
 {
   return CoordPointT(
         static_cast<CoordT>(pt.x) * (MercatorBounds::maxX - MercatorBounds::minX)
-            / CoordSize() + MercatorBounds::minX,
+            / CoordSize(coordBits) + MercatorBounds::minX,
         static_cast<CoordT>(pt.y) * (MercatorBounds::maxY - MercatorBounds::minY)
-            / CoordSize() + MercatorBounds::minY);
+            / CoordSize(coordBits) + MercatorBounds::minY);
 }
 
-CoordPointT Int64ToPoint(int64_t v)
+CoordPointT Int64ToPoint(int64_t v, uint32_t coordBits)
 {
   ASSERT_LESS_OR_EQUAL(v, 3ULL << 2 * POINT_COORD_BITS, ());
-  return PointU2PointD(m2::Uint64ToPointU(static_cast<uint64_t>(v)));
+  return PointU2PointD(m2::Uint64ToPointU(static_cast<uint64_t>(v)), coordBits);
 }
 
-pair<int64_t, int64_t> RectToInt64(m2::RectD const & r)
+pair<int64_t, int64_t> RectToInt64(m2::RectD const & r, uint32_t coordBits)
 {
-  int64_t const p1 = PointToInt64(r.minX(), r.minY());
-  int64_t const p2 = PointToInt64(r.maxX(), r.maxY());
+  int64_t const p1 = PointToInt64(r.minX(), r.minY(), coordBits);
+  int64_t const p2 = PointToInt64(r.maxX(), r.maxY(), coordBits);
   return make_pair(p1, p2);
 }
 
-m2::RectD Int64ToRect(pair<int64_t, int64_t> const & p)
+m2::RectD Int64ToRect(pair<int64_t, int64_t> const & p, uint32_t coordBits)
 {
-  CoordPointT const pt1 = Int64ToPoint(p.first);
-  CoordPointT const pt2 = Int64ToPoint(p.second);
+  CoordPointT const pt1 = Int64ToPoint(p.first, coordBits);
+  CoordPointT const pt2 = Int64ToPoint(p.second, coordBits);
   return m2::RectD(m2::PointD(pt1.first, pt1.second), m2::PointD(pt2.first, pt2.second));
 }