diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index a1bdb9695..bd39a47a7 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -426,11 +426,14 @@ class FileHandler
 	 */
 	public static function returnBytes($val)
 	{
+		$val = preg_replace('/[^0-9\.PTGMK]/', '', $val);
 		$unit = strtoupper(substr($val, -1));
 		$val = (float)$val;
 
 		switch ($unit)
 		{
+			case 'P': $val *= 1024;
+			case 'T': $val *= 1024;
 			case 'G': $val *= 1024;
 			case 'M': $val *= 1024;
 			case 'K': $val *= 1024;