diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index c2bea2d836d95f5e0b85fe205be4611473ccf23d..320b1f79199aefc06a814d1d7d915ee77c5d5443 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -120,7 +120,20 @@ class OC_MEDIA_SCANNER{
 				$title=stripslashes($data['comments']['title'][0]);
 			}
 			$size=$data['filesize'];
-			$track=(isset($data['comments']['track']))?$data['comments']['track'][0]:0;
+			if (isset($data['comments']['track']))
+			{
+				$track = $data['comments']['track'][0];
+			}
+			else if (isset($data['comments']['track_number']))
+			{
+				$track = $data['comments']['track_number'][0];
+				$track = explode('/',$track);
+				$track = $track[0];
+			}
+			else
+			{
+				$track = 0;
+			}
 			$length=isset($data['playtime_seconds'])?round($data['playtime_seconds']):0;
 		}
 		if(!isset(self::$artists[$artist])){