diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/util/PathStack.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/util/PathStack.kt
index eeafbe4f..9d34708a 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/util/PathStack.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/util/PathStack.kt
@@ -4,8 +4,13 @@ import com.github.benmanes.caffeine.cache.Interner
 import kotlin.concurrent.getOrSet
 
 class PathStack(private val interner: Interner<String> = Interner { it }) {
-	private val _stack = ThreadLocal<ArrayDeque<String>>()
-	private val stack: ArrayDeque<String> get() = _stack.getOrSet { ArrayDeque() }
+	private val _stack = object : ThreadLocal<ArrayDeque<String>>() {
+		override fun initialValue(): ArrayDeque<String> {
+			return ArrayDeque()
+		}
+	}
+
+	private val stack: ArrayDeque<String> get() = _stack.get()
 
 	fun push(value: String) {
 		stack.addLast(value)