diff --git a/templates/Classic/admin/traffic/index.tpl b/templates/Classic/admin/traffic/index.tpl
index 2d2079de..ed288331 100644
--- a/templates/Classic/admin/traffic/index.tpl
+++ b/templates/Classic/admin/traffic/index.tpl
@@ -1,6 +1,31 @@
 $header
 	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.js"></script>
 	<script type="text/javascript" src="templates/jquery.tablesorter.min.js"></script> 
+        <script type="text/javascript">
+                $.tablesorter.addParser( {
+                        id: 'filesize',
+                        is: function(s) {
+                                return s.match( new RegExp( /[0-9]+(\.[0-9]+)?\ (KiB|Bi|GiB|MiB|TiB)/ ) );
+                        },
+                        format: function(s) {
+                                var suf = s.match( new RegExp( /(KiB|Bi|GiB|MiB|TiB)/) )[1];
+                                var num = parseFloat( s.match( new RegExp( /^[0-9]+(\.[0-9]+)?/ ) )[0] );
+                                switch( suf ) {
+                                        case 'Bi':
+                                                return num;
+                                        case 'KiB':
+                                                return num * 1024;
+                                        case 'MiB':
+                                                return num * 1024 * 1024;
+                                        case 'GiB':
+                                                return num * 1024 * 1024 * 1024;
+                                        case 'TiB':
+                                                return num * 1024 * 1024 * 1024 * 1024;
+                                }
+                        },
+                        type: 'numeric'
+                });
+        </script>
 	{$stats_tables}
 	<br />
 	<br />
diff --git a/templates/Classic/admin/traffic/index_table.tpl b/templates/Classic/admin/traffic/index_table.tpl
index 6308e369..e85011d1 100644
--- a/templates/Classic/admin/traffic/index_table.tpl
+++ b/templates/Classic/admin/traffic/index_table.tpl
@@ -34,18 +34,31 @@
 		{  
 		    // extract data from markup and return it  
 		    if(node.innerHTML != '-') {
-			return 1 + node.innerHTML.substr(0,node.innerHTML.length-3); 
+			return 1 + node.innerHTML.substr(0,node.innerHTML.length); 
 		    } else {
 			return '1';
 		    }
 		} 
 		$(document).ready(function() 
 		{ 
-			$("#stats{$overview['year']}").tablesorter( {
-				textExtraction: myTextExtraction
-			} ); 
-		} 
-		); 
+                        $("#stats{$overview['year']}").tablesorter( {
+                                textExtraction: myTextExtraction,
+                                headers: {
+                                        1: {sorter: 'filesize'},
+                                        2: {sorter: 'filesize'},
+                                        3: {sorter: 'filesize'},
+                                        4: {sorter: 'filesize'},
+                                        5: {sorter: 'filesize'},
+                                        6: {sorter: 'filesize'},
+                                        7: {sorter: 'filesize'},
+                                        8: {sorter: 'filesize'},
+                                        9: {sorter: 'filesize'},
+                                        10: {sorter: 'filesize'},
+                                        11: {sorter: 'filesize'},
+                                        12: {sorter: 'filesize'}
+                                },
+                        });
+		}); 
 	</script>
 	<br />
 	<br />
diff --git a/templates/Froxlor/admin/traffic/index.tpl b/templates/Froxlor/admin/traffic/index.tpl
index e2daeacc..4217a62c 100644
--- a/templates/Froxlor/admin/traffic/index.tpl
+++ b/templates/Froxlor/admin/traffic/index.tpl
@@ -1,6 +1,31 @@
 $header
 	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.js"></script>
 	<script type="text/javascript" src="templates/jquery.tablesorter.min.js"></script> 
+	<script type="text/javascript">
+		$.tablesorter.addParser( {
+			id: 'filesize',
+			is: function(s) {
+				return s.match( new RegExp( /[0-9]+(\.[0-9]+)?\ (KiB|Bi|GiB|MiB|TiB)/ ) );
+			},
+			format: function(s) {
+				var suf = s.match( new RegExp( /(KiB|Bi|GiB|MiB|TiB)/) )[1];
+				var num = parseFloat( s.match( new RegExp( /^[0-9]+(\.[0-9]+)?/ ) )[0] );
+				switch( suf ) {
+					case 'Bi':
+						return num;
+					case 'KiB':
+						return num * 1024;
+					case 'MiB':
+						return num * 1024 * 1024;
+					case 'GiB':
+						return num * 1024 * 1024 * 1024;
+					case 'TiB':
+						return num * 1024 * 1024 * 1024 * 1024;
+				}
+			},
+			type: 'numeric'
+		});
+	</script>
 		<article>
 			<header>
 				<h2>
diff --git a/templates/Froxlor/admin/traffic/index_table.tpl b/templates/Froxlor/admin/traffic/index_table.tpl
index f6a24bdf..e6b4c19e 100644
--- a/templates/Froxlor/admin/traffic/index_table.tpl
+++ b/templates/Froxlor/admin/traffic/index_table.tpl
@@ -33,7 +33,7 @@
 		{  
 		    // extract data from markup and return it  
 		    if(node.innerHTML != '-') {
-			return 1 + node.innerHTML.substr(0,node.innerHTML.length-3); 
+			return 1 + node.innerHTML.substr(0,node.innerHTML.length); 
 		    } else {
 			return '1';
 		    }
@@ -41,8 +41,22 @@
 		$(document).ready(function() 
 		{ 
 			$("#stats{$overview['year']}").tablesorter( {
-				textExtraction: myTextExtraction
-			} ); 
+				textExtraction: myTextExtraction,
+				headers: {
+					1: {sorter: 'filesize'},
+					2: {sorter: 'filesize'},
+					3: {sorter: 'filesize'},
+					4: {sorter: 'filesize'},
+					5: {sorter: 'filesize'},
+					6: {sorter: 'filesize'},
+					7: {sorter: 'filesize'},
+					8: {sorter: 'filesize'},
+					9: {sorter: 'filesize'},
+					10: {sorter: 'filesize'},
+					11: {sorter: 'filesize'},
+					12: {sorter: 'filesize'}
+				},
+			});
 		} 
 		); 
 	</script>