diff --git a/src/elements/elec.c b/src/elements/elec.c
index 6acbbab46..a5c254fd4 100644
--- a/src/elements/elec.c
+++ b/src/elements/elec.c
@@ -79,7 +79,7 @@ int update_ELEC(UPDATE_FUNC_ARGS) {
 					kill_part(i);
 					return 1;
 				}
-				if (ptypes[r&0xFF].properties & PROP_CONDUCTS)
+				if (ptypes[r&0xFF].properties & PROP_CONDUCTS && ((r&0xFF)!=PT_H2||parts[i].tmp!=1))
 				{
 					create_part(-1, x+rx, y+ry, PT_SPRK);
 					kill_part(i);
diff --git a/src/elements/h2.c b/src/elements/h2.c
index 529f22b73..fa504ca7b 100644
--- a/src/elements/h2.c
+++ b/src/elements/h2.c
@@ -3,6 +3,8 @@
 int update_H2(UPDATE_FUNC_ARGS)
 {
 	int r,rx,ry,rt;
+	if (parts[i].temp > 2273.15 && pv[y/CELL][x/CELL] > 50.0f)
+		parts[i].tmp = 1;
 	for (rx=-2; rx<3; rx++)
 		for (ry=-2; ry<3; ry++)
 			if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry))
@@ -16,24 +18,24 @@ int update_H2(UPDATE_FUNC_ARGS)
 					part_change_type(r>>8,x+rx,y+ry,PT_WATR);
 					part_change_type(i,x,y,PT_OIL);
 				}
+				if (parts[r>>8].temp > 2273.15)// && pv[y/CELL][x/CELL] > 50.0f)
+					continue;
 				if (parts[i].tmp != 1)
 				{
-					if ((r&0xFF)==PT_FIRE)
+					if (rt==PT_FIRE)
 					{
 						parts[r>>8].temp=2473.15;
 						if(parts[r>>8].tmp&0x02)
 						parts[r>>8].temp=3473;
 						parts[r>>8].tmp |= 1;
 					}
-					if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA)
+					if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA)
 					{
 						create_part(i,x,y,PT_FIRE);
 						parts[i].temp+=(rand()/(RAND_MAX/100));
 						parts[i].tmp |= 1;
 					}
 				}
-				if (parts[i].temp > 2273.15 && pv[y/CELL][x/CELL] > 50.0f && (r&0xFF) == PT_H2)
-					parts[r>>8].tmp = 1;
 			}
 	if (parts[i].temp > 2273.15 && pv[y/CELL][x/CELL] > 50.0f)
 	{
@@ -42,14 +44,21 @@ int update_H2(UPDATE_FUNC_ARGS)
 		{
 			int j;
 			part_change_type(i,x,y,PT_PLSM);
+			parts[i].life = rand()%150+50;
 			create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT);
 			create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC);
 			j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
-			if (j)
-				parts[j].ctype = 0xFFFF00;
-			create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
+			if (j) parts[j].ctype = 0xFFFF00;
+
+			j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
+			if (j) parts[j].tmp = 1;
+
 			if (rand()%2)
-				create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
+			{
+				j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
+				if (j) parts[j].tmp = 1;
+			}
+
 			if (parts[i].temp < 4273.15)
 				parts[i].temp = 4273.15;
 			pv[y/CELL][x/CELL] += 50;
diff --git a/src/elements/pyro.c b/src/elements/pyro.c
index aa386ebea..003c8f8d7 100644
--- a/src/elements/pyro.c
+++ b/src/elements/pyro.c
@@ -46,7 +46,7 @@ int update_PYRO(UPDATE_FUNC_ARGS) {
 					(t!=PT_SPRK || (rt!=PT_RBDM && rt!=PT_LRBD && rt!=PT_INSL)) &&
 					(t!=PT_PHOT || rt!=PT_INSL) &&
 				    (rt!=PT_SPNG || parts[r>>8].life==0) &&
-					(rt!=PT_H2 || parts[r>>8].tmp!=1) &&
+					(rt!=PT_H2 || (parts[r>>8].temp < 2273.15 && pv[y/CELL][x/CELL] < 50.0f)) &&
 					ptypes[rt].flammable && (ptypes[rt].flammable + (int)(pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000))
 				{
 					part_change_type(r>>8,x+rx,y+ry,PT_FIRE);
diff --git a/src/elements/sprk.c b/src/elements/sprk.c
index 0ca666ff5..00279f570 100644
--- a/src/elements/sprk.c
+++ b/src/elements/sprk.c
@@ -44,7 +44,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 			parts[nearp].ctype = PT_ETRD;
 		}
 	}
-	else if (ct==PT_NBLE&&parts[i].life<=1)
+	else if (ct==PT_NBLE&&parts[i].life<=1&&parts[i].tmp!=1)
 	{
 		parts[i].life = rand()%150+50;
 		part_change_type(i,x,y,PT_PLSM);
@@ -179,6 +179,8 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 					conduct_sprk = 0;
 				if (rt==PT_INST&&ct!=PT_PSCN)
 					conduct_sprk = 0;
+				if (rt == PT_NBLE && parts[r>>8].tmp == 1)
+					conduct_sprk = 0;
 
 				if (conduct_sprk) {
 					if (rt==PT_WATR||rt==PT_SLTW) {