diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a8918a587a..91f8af8ca1 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/06/03
+	* Solved the bug that made firewalls only castable a few times until [MasterOfMuppets]
+	  you relogged. Thanks to Euph for the fix.
 	* Added variable other_mapserver_count to chrif.c which holds total count
 	  of connected map-servers. By using this we prevent sending unnecessary
 	  packets to the char-server when there's no more map-servers connected.
diff --git a/src/map/skill.c b/src/map/skill.c
index 28a6572114..663ebee218 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6689,7 +6689,7 @@ int skill_unit_onplace_timer(struct skill_unit *src,struct block_list *bl,unsign
 				skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
 				src->val2--;
 			}
-			if (src->val2<=0)
+			if (--src->val2<=0)
 				skill_delunit(src);
 		break;
 		}