diff --git a/tracker/tracker_fmodex.c b/tracker/tracker_fmodex.c
index eafcfde..186984f 100644
--- a/tracker/tracker_fmodex.c
+++ b/tracker/tracker_fmodex.c
@@ -2,6 +2,7 @@
  * FMOD PLAYBACK, LINKED DYNAMICALLY
  * THIS TOTALLY WON'T BUILD ON ITS OWN, I SWEAR.
  * YOU'D HAVE TO KNOW HOW TO LINK IT AND STUFF BY YOURSELF.
+ * LGPL
  */
 
 #include "globaldef.h"
@@ -33,7 +34,7 @@ void FmodEx_Play(byte track, qboolean looping)
 
 	FMOD_Sound_Release (fmod_sound);
 
-   	sprintf(fmod_file, "%s/music/track%d.flac", com_gamedir, fmod_track);
+   	sprintf(fmod_file, "%s/music/track%02d.flac", com_gamedir, fmod_track);
 	if(fmod_loop == true)
     		fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file, 
 				FMOD_SOFTWARE | FMOD_2D | FMOD_LOOP_NORMAL | FMOD_CREATESTREAM, 0, &fmod_sound);
@@ -43,7 +44,7 @@ void FmodEx_Play(byte track, qboolean looping)
 
 	if (fmod_result != FMOD_OK) 
 	{
-		sprintf(fmod_file, "%s/music/track%d.ogg", com_gamedir, fmod_track);
+		sprintf(fmod_file, "%s/music/track%02d.wav", com_gamedir, fmod_track);
 
 		if(fmod_loop == true)
     			fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file, 
@@ -54,8 +55,20 @@ void FmodEx_Play(byte track, qboolean looping)
 
 		if (fmod_result != FMOD_OK) 
 		{
-			Con_Printf("FmodEx: Can't load %s!\n", fmod_file);
-			return;
+			sprintf(fmod_file, "%s/music/track%02d.ogg", com_gamedir, fmod_track);
+
+			if(fmod_loop == true)
+    				fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file, 
+					FMOD_SOFTWARE | FMOD_2D | FMOD_LOOP_NORMAL | FMOD_CREATESTREAM, 0, &fmod_sound);
+			else
+				fmod_result = FMOD_System_CreateSound (fmod_system, fmod_file, 
+					FMOD_SOFTWARE | FMOD_2D | FMOD_LOOP_OFF | FMOD_CREATESTREAM, 0, &fmod_sound);
+
+			if (fmod_result != FMOD_OK) 
+			{	
+				Con_Printf("FmodEx: Can't load %s!\n", fmod_file);
+				return;
+			}
 		}
 	}