diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 1c30c6fe0..c1af4869c 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1010,7 +1010,7 @@ class Context {
 		$avail_types = array('head', 'body');
 		if(!in_array($type, $avail_types)) $type = $avail_types[0];
 
-		$key = $self->normalizeFilePath($file)."\t".$targetie;
+		$key = Context::getAbsFileUrl($file)."\t".$targetie;
 		$map = &$self->js_files_map;
 
 		// Is this file already registered?
@@ -1024,11 +1024,10 @@ class Context {
 	function unloadJsFile($file, $optimized = false, $targetie = '') {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
 
-		$realfile = $self->getAbsFileUrl($file);
+		$remove_key = Context::getAbsFileUrl($file)."\t$targetie";
 
 		foreach($self->js_files_map as $key=>$val) {
-			list($_file, $_targetie) = explode("\t", $key);
-			if($self->getAbsFileUrl($_file)==$realfile && $_targetie == $targetie) {
+			if($key === $remove_key) {
 				unset($self->js_files_map[$key]);
 				return;
 			}
@@ -1095,7 +1094,7 @@ class Context {
 	function addCSSFile($file, $optimized=false, $media='all', $targetie='',$index=0) {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
 
-		$key = $self->normalizeFilePath($file)."\t".$targetie."\t".$media;
+		$key = Context::getAbsFileUrl($file)."\t$targetie\t$media";
 		$map = &$self->css_files_map;
 
 		if (!isset($map[$key]) || (int)$map[$key] > (int)$index) $map[$key] = (int)$index+count($map)/100-1;
@@ -1107,11 +1106,10 @@ class Context {
 	function unloadCSSFile($file, $optimized = false, $media = 'all', $targetie = '') {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
 
-		$realfile = $self->getAbsFileUrl($file);
+		$remove_key = Context::getAbsFileUrl($file)."\t$targetie\t$media";
 
 		foreach($self->css_files_map as $key => $val) {
-			list($_file, $_targetie, $_media) = explode("\t", $key);
-			if($self->getAbsFileUrl($_file)==$realfile && $_media==$media && $_targetie==$targetie) {
+			if($key === $remove_key) {
 				unset($self->css_files_map[$key]);
 				return;
 			}