diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a7fc86..4888d01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
-
-# See https://cmake.org/cmake/help/latest/policy/CMP0077.html
-# This allows for setting option variables externally, when this project
-# is included in another CMake project.
-cmake_policy(SET CMP0077 NEW)
+cmake_minimum_required(VERSION 3.13)
 
 project(inja
         DESCRIPTION "Template engine for modern C++"
diff --git a/include/inja/parser.hpp b/include/inja/parser.hpp
index 816f589..8882dfe 100644
--- a/include/inja/parser.hpp
+++ b/include/inja/parser.hpp
@@ -659,7 +659,6 @@ class Parser {
       } break;
       }
     }
-    current_block = nullptr;
   }
 
 public:
diff --git a/single_include/inja/inja.hpp b/single_include/inja/inja.hpp
index db597fa..2fdbb70 100644
--- a/single_include/inja/inja.hpp
+++ b/single_include/inja/inja.hpp
@@ -2109,7 +2109,6 @@ class Parser {
       } break;
       }
     }
-    current_block = nullptr;
   }
 
 public: