diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ff96ed..5207432 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,14 +10,12 @@
 ### Removed
 
 ### Fixed
-## [0.3.2]
-### Added
+## [0.3.3]
 
 ### Changed
+- Block stack in parser shouldn’t be static (#16)
 
-### Deprecated
-
-### Removed
+## [0.3.2]
 
 ### Fixed
 - Intermittent issues indexing projects (#14)
diff --git a/build.gradle b/build.gradle
index d07483c..511c2b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.kinglozzer'
-version '0.3.2'
+version '0.3.3'
 
 sourceSets {
     main.java.srcDirs = ['src/main/java', 'src/main/gen']
diff --git a/src/main/java/com/kinglozzer/silverstripe/parser/SilverstripeParser.java b/src/main/java/com/kinglozzer/silverstripe/parser/SilverstripeParser.java
index 784b777..59a0a93 100644
--- a/src/main/java/com/kinglozzer/silverstripe/parser/SilverstripeParser.java
+++ b/src/main/java/com/kinglozzer/silverstripe/parser/SilverstripeParser.java
@@ -16,11 +16,12 @@
 import static com.kinglozzer.silverstripe.parser.SilverstripeTokenTypes.*;
 
 public class SilverstripeParser implements PsiParser {
-    private static final ArrayDeque<Pair<String, Marker>> blockStack = new ArrayDeque<>();
+    private final ArrayDeque<Pair<String, Marker>> blockStack = new ArrayDeque<>();
 
     @Override
     @NotNull
     public ASTNode parse(@NotNull IElementType root, PsiBuilder builder) {
+        blockStack.clear();
         builder.setDebugMode(true);
 
         final Marker rootMarker = builder.mark();