diff --git a/include/etl/ranges.h b/include/etl/ranges.h
index b502f82d..9ab8b1a6 100644
--- a/include/etl/ranges.h
+++ b/include/etl/ranges.h
@@ -150,7 +150,8 @@ namespace etl
         return *etl::prev(cend());
       }
 
-      constexpr decltype(auto) operator[](size_t i)
+      template < typename D2 = D, etl::enable_if_t<!etl::is_random_access_iterator< decltype(etl::declval<const D2&>().begin())>::value, int> = 0>
+      constexpr decltype(auto) operator[](range_difference_t<D2> i)
       {
         auto it{static_cast<D*>(this)->begin()};
         etl::advance(it, i);
@@ -158,13 +159,13 @@ namespace etl
       }
 
       template < typename D2 = D, etl::enable_if_t<etl::is_random_access_iterator< decltype(etl::declval<const D2&>().begin())>::value, int> = 0>
-      constexpr decltype(auto) operator[](size_t i)
+      constexpr decltype(auto) operator[](range_difference_t<D2> i)
       {
         return static_cast<D*>(this)->begin()[i];
       }
 
       template < typename D2 = D, etl::enable_if_t<etl::is_random_access_iterator< decltype(etl::declval<const D2&>().begin())>::value, int> = 0>
-      constexpr decltype(auto) operator[](size_t i) const
+      constexpr decltype(auto) operator[](range_difference_t<D2> i) const
       {
         return cbegin()[i];
       }
@@ -502,6 +503,11 @@ namespace etl
         return _i;
       }
 
+      constexpr value_type operator[](difference_type n) const
+      {
+        return *(*this + n);
+      }
+
     private:
 
       value_type _i;
@@ -673,6 +679,11 @@ namespace etl
         return _value;
       }
 
+      constexpr value_type operator[](difference_type n) const
+      {
+        return *(*this + n);
+      }
+
     private:
 
       value_type _value;
diff --git a/test/test_ranges.cpp b/test/test_ranges.cpp
index efe64148..cab77148 100644
--- a/test/test_ranges.cpp
+++ b/test/test_ranges.cpp
@@ -473,6 +473,20 @@ namespace
       CHECK_EQUAL(iv3.empty(), true);
     }
 
+    TEST(test_ranges_iota_view_const)
+    {
+      const auto iv = etl::ranges::iota_view(1, 7);
+
+      int compare = 1;
+      for (auto i : iv)
+      {
+        CHECK_EQUAL(i, compare);
+        ++compare;
+      }
+
+      CHECK_EQUAL(iv[4], 5);
+    }
+
     TEST(test_ranges_views_iota)
     {
       auto iv = etl::ranges::views::iota(1, 7);
@@ -540,6 +554,18 @@ namespace
       CHECK_EQUAL(iv3.empty(), true);
     }
 
+    TEST(test_ranges_repeat_view_const)
+    {
+      const auto rv = etl::ranges::repeat_view(1, 7);
+
+      for (auto i : rv)
+      {
+        CHECK_EQUAL(i, 1);
+      }
+
+      CHECK_EQUAL(rv[4], 1);
+    }
+
     TEST(test_ranges_views_repeat)
     {
       auto iv = etl::ranges::views::repeat(1, 7);