diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg
index aebab4e9010..e52c8758efd 100644
--- a/data/core/terrain-graphics.cfg
+++ b/data/core/terrain-graphics.cfg
@@ -529,11 +529,14 @@
 {WALL_TRANSITION_P    (!,Chr,Chs,Cha,Ce*,Ke*,!,Ch*)  (W*)                        50  castle/sunken-ruin1}
 {WALL_TRANSITION      (!,Chr,Chs,Cha,Ce*,Ke*,!,Ch*)  (W*)                            castle/sunken-ruin}
 
-{WALL_TRANSITION2_P   (Khw,Khs)          C*,K*           (W*,Ss)         75          castle/sunken-ruinkeep1-castle}
-{WALL_TRANSITION2_P   (Khw,Khs)          C*,K*           (W*,Ss)         100         castle/sunkenkeep-castle}
+# This part doesn't work right
+{WALL_TRANSITION2_P   (Khw,Khs)          (Ch*)           (W*,Ss)     75  castle/sunken-ruinkeep1-castle}
+{WALL_TRANSITION2_P   (Khw,Khs)          (Ch*)           (W*,Ss)     100 castle/sunkenkeep-castle}
+
+{WALL_TRANSITION_P    (!,Khr,!,Kh*)      (W*,Ss,Chw,Chs)             75  castle/sunken-ruinkeep1}
+{WALL_TRANSITION_P    (!,Khr,!,Kh*)      (W*,Ss,Chw,Chs)             100 castle/sunkenkeep}
+
 
-{WALL_TRANSITION_P    (!,Khr,!,Kh*)      (W*,Ss,Chw,Chs)                         75  castle/sunken-ruinkeep1}
-{WALL_TRANSITION_P    (!,Khr,!,Kh*)      (W*,Ss,Chw,Chs)                         100 castle/sunkenkeep}
 
 # ruined castle and non-sumberged parts of sunken/swamp ruins