diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7ec67d53f3..6b12523b7e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/03/24
+	* Fixed unit_skillcastcancel reading the nocastcancel flags the exact
+	  wrong way around [blackhole89]
 	* Added function map_search_freecell to locate an available cell around an
 	  area (for recall/warping skills). UNTESTED. [Skotlex]
 	* Added unit.c to the VC8 project files. Thanks to Joshuaali [Skotlex]
diff --git a/src/map/unit.c b/src/map/unit.c
index 1e2e2268be..ad76f5145f 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1250,8 +1250,8 @@ int unit_skillcastcancel(struct block_list *bl,int type)
 		if (!ud->state.skillcastcancel)
 			return 0;
 
-		if (sd && !sd->special_state.no_castcancel2 &&
-			!(sd->special_state.no_castcancel && !map_flag_gvg(bl->m)))
+		if (sd && (sd->special_state.no_castcancel2 ||
+			(sd->special_state.no_castcancel && !map_flag_gvg(bl->m)))) //fixed flags being read the wrong way around [blackhole89]
 			return 0;
 	}