diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 95b5b8776..646ac95e8 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1339,7 +1339,7 @@ class Context
 					unset($_FILES[$key]);
 					continue;
 				}
-				$val['name'] = str_replace('&', '&', escape($val['name'], false));
+				$val['name'] = Rhymix\Framework\Filters\FilenameFilter::clean($val['name']);
 				self::set($key, $val, true);
 				self::set('is_uploaded', true);
 				self::$_instance->is_uploaded = true;
@@ -1365,7 +1365,7 @@ class Context
 						break;
 					}
 					$file = array();
-					$file['name'] = str_replace('&', '&', escape($val['name'][$i], false));
+					$file['name'] = Rhymix\Framework\Filters\FilenameFilter::clean($val['name'][$i]);
 					$file['type'] = $val['type'][$i];
 					$file['tmp_name'] = $val['tmp_name'][$i];
 					$file['error'] = $val['error'][$i];