diff --git a/src/ffx/ffx.py b/src/ffx/ffx.py
index d89d88f..a14a2f7 100755
--- a/src/ffx/ffx.py
+++ b/src/ffx/ffx.py
@@ -549,7 +549,7 @@ def convert(ctx,
         targetSuffices = {}
 
 
-        mediaFileProperties = FileProperties(context, sourceFilename)
+        mediaFileProperties = FileProperties(context, sourcePath)
 
 
         ssc = ShiftedSeasonController(context)
@@ -722,7 +722,8 @@ def convert(ctx,
 
             targetFilename = f"{'_'.join(targetFilenameTokens)}.{targetExtension}"
 
-            targetPath = os.path.join(output_directory if output_directory else sourceDirectory, targetFilename)
+            # targetPath = os.path.join(output_directory if output_directory else sourceDirectory, targetFilename)
+            targetPath = os.path.join(output_directory, targetFilename) if output_directory else targetFilename
 
             #TODO: target extension anpassen
             ctx.obj['logger'].info(f"Creating file {targetFilename}")