diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1b3f93..88ca045 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.2.17 (2024-10-04)
+
+- Fixed nested conditionals
+
 ## version 1.2.16 (2024-10-03)
 
 - Fixed conditionals after PClose
diff --git a/haxelib.json b/haxelib.json
index 5de6824..49be1e5 100644
--- a/haxelib.json
+++ b/haxelib.json
@@ -7,8 +7,8 @@
     "contributors": [
         "AlexHaxe"
     ],
-    "releasenote": "fixed conditionals after PClose - see CHANGELOG for details",
-    "version": "1.2.16",
+    "releasenote": "fixed nested conditionals - see CHANGELOG for details",
+    "version": "1.2.17",
     "url": "https://github.com/HaxeCheckstyle/tokentree",
     "dependencies": {}
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 546fa82..c4a21f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "tokentree",
-    "version": "1.2.16",
+    "version": "1.2.17",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "tokentree",
-            "version": "1.2.16",
+            "version": "1.2.17",
             "license": "MIT",
             "devDependencies": {
                 "lix": "^15.12.0"
diff --git a/package.json b/package.json
index b5ed3e7..e34e7eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tokentree",
-    "version": "1.2.16",
+    "version": "1.2.17",
     "description": "TokenTree library used by haxe-checkstyle, haxe-formatter and haxe-languageserver",
     "repository": {
         "type": "git",
diff --git a/src/tokentree/walk/WalkPOpen.hx b/src/tokentree/walk/WalkPOpen.hx
index 7b61f8a..66dedc9 100644
--- a/src/tokentree/walk/WalkPOpen.hx
+++ b/src/tokentree/walk/WalkPOpen.hx
@@ -19,7 +19,10 @@ class WalkPOpen {
 					pOpen.addChild(arrow);
 					WalkBlock.walkBlock(stream, arrow);
 				case Sharp(WalkSharpConsts.IF):
-					WalkSharp.walkSharp(stream, parent, WalkStatement.walkStatement);
+					switch (parent.tok) {
+						case Sharp(WalkSharpConsts.IF):
+						default: WalkSharp.walkSharp(stream, parent, WalkStatement.walkStatement);
+					}
 				default:
 			}
 		}