diff --git a/include/beman/utf_view/to_utf_view.hpp b/include/beman/utf_view/to_utf_view.hpp
index d647287c..83ba5805 100644
--- a/include/beman/utf_view/to_utf_view.hpp
+++ b/include/beman/utf_view/to_utf_view.hpp
@@ -205,7 +205,7 @@ class exposition_only_to_utf_view_impl {
     {
       if (buf_index_ + 1 < buf_last_) {
         ++buf_index_;
-      } else if (buf_index_ + 1 == buf_last_) {
+      } else {
         std::advance(base(), to_increment_);
         to_increment_ = 0;
         if (base() != end()) {
@@ -221,7 +221,7 @@ class exposition_only_to_utf_view_impl {
     {
       if (buf_index_ + 1 == buf_last_ && base() != end()) {
         read();
-      } else if (buf_index_ + 1 <= buf_last_) {
+      } else {
         ++buf_index_;
       }
     }