diff --git a/src/elements/cbnw.c b/src/elements/cbnw.c
index 62655cf8f..95db27ed2 100644
--- a/src/elements/cbnw.c
+++ b/src/elements/cbnw.c
@@ -76,8 +76,9 @@ int update_CBNW(UPDATE_FUNC_ARGS) {
 				{
 					part_change_type(i,x,y,PT_FIRE);
 					parts[i].life = 4;
+					parts[i].ctype = PT_WATR;
 				}
-				if ((r&0xFF)==PT_FIRE){
+				if ((r&0xFF)==PT_FIRE && parts[r>>8].ctype!=PT_WATR){
 					kill_part(r>>8);
 						if(1>(rand()%150)){
 							kill_part(i);
diff --git a/src/elements/watr.c b/src/elements/watr.c
index ac8d8e3b4..58a01a224 100644
--- a/src/elements/watr.c
+++ b/src/elements/watr.c
@@ -18,8 +18,9 @@ int update_WATR(UPDATE_FUNC_ARGS) {
 				{
 					part_change_type(i,x,y,PT_FIRE);
 					parts[i].life = 4;
+					parts[i].ctype = PT_WATR;
 				}
-				if ((r&0xFF)==PT_FIRE){
+				if ((r&0xFF)==PT_FIRE && parts[r>>8].ctype!=PT_WATR){
 					kill_part(r>>8);
 						if(1>(rand()%150)){
 							kill_part(i);
diff --git a/src/elements/wtrv.c b/src/elements/wtrv.c
index 2e8ca3a80..8532600b7 100644
--- a/src/elements/wtrv.c
+++ b/src/elements/wtrv.c
@@ -13,6 +13,7 @@ int update_WTRV(UPDATE_FUNC_ARGS) {
 				{
 					part_change_type(i,x,y,PT_FIRE);
 					parts[i].life = 4;
+					parts[i].ctype = PT_WATR;
 				}
 			}
 	if(parts[i].temp>1273&&parts[i].ctype==PT_FIRE)