diff --git a/package-lock.json b/package-lock.json
index 1ed39b5..4a1f904 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "pashto-inflector",
-  "version": "5.1.5",
+  "version": "5.1.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "pashto-inflector",
-      "version": "5.1.5",
+      "version": "5.1.7",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 0aaa936..9388cd0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pashto-inflector",
-  "version": "5.1.5",
+  "version": "5.1.7",
   "author": "lingdocs.com",
   "description": "A Pashto inflection and verb conjugation engine, inculding React components for displaying Pashto text, inflections, and conjugations",
   "homepage": "https://verbs.lingdocs.com",
diff --git a/src/components/package.json b/src/components/package.json
index 30ebdb8..31617bf 100644
--- a/src/components/package.json
+++ b/src/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingdocs/ps-react",
-  "version": "5.1.4",
+  "version": "5.1.7",
   "description": "Pashto inflector library module with React components",
   "main": "dist/components/library.js",
   "module": "dist/components/library.js",
diff --git a/src/lib/package.json b/src/lib/package.json
index 40df375..cf7b989 100644
--- a/src/lib/package.json
+++ b/src/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lingdocs/inflect",
-  "version": "5.1.4",
+  "version": "5.1.7",
   "description": "Pashto inflector library",
   "main": "dist/index.js",
   "types": "dist/lib/library.d.ts",
diff --git a/src/lib/src/phrase-building/render-sandwich.ts b/src/lib/src/phrase-building/render-sandwich.ts
index 8faeff5..9888ecb 100644
--- a/src/lib/src/phrase-building/render-sandwich.ts
+++ b/src/lib/src/phrase-building/render-sandwich.ts
@@ -14,11 +14,11 @@ export function renderSandwich(s: T.SandwichSelection<T.Sandwich>): T.Rendered<T
             inflectInside,
             "subject",
             "none",
-            isPuSandwich(s),
+            isPuLocationSandwich(s),
         ),
     };
 }
 
-function isPuSandwich(s: T.SandwichSelection<T.Sandwich>): boolean {
-    return s.before?.p === "په";
+function isPuLocationSandwich(s: T.SandwichSelection<T.Sandwich>): boolean {
+    return s.before?.p === "په" && !!["کې", "کښې", "باندې"].includes(s.after?.p || "")
 }
\ No newline at end of file