diff --git a/src/command_manager.cc b/src/command_manager.cc
index b01dea2b..81cd1c02 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -172,8 +172,11 @@ void skip_blanks_and_comments(StringView base, ByteCount& pos)
             pos += 2;
         else if (base[pos] == '#')
         {
-            while (pos != length and base[pos] != '\n')
-                ++pos;
+            while (pos != length)
+            {
+                if (base[pos++] == '\n')
+                    break;
+            }
         }
         else
             break;