diff --git a/source/Axiom/Axiom/FFmpeg/FFprobe.cs b/source/Axiom/Axiom/FFmpeg/FFprobe.cs
index a7051490..bc84ee00 100644
--- a/source/Axiom/Axiom/FFmpeg/FFprobe.cs
+++ b/source/Axiom/Axiom/FFmpeg/FFprobe.cs
@@ -314,7 +314,7 @@ public static void VideoEntryType(ViewModel vm)
 
 
         /// <summary>
-        /// FFprobe Audio Entry Type Containers (Method)
+        ///     FFprobe Audio Entry Type Containers (Method)
         /// </summary>
         // Used for Auto Quality to pass Bit Rate Entry Type to FFprobe
         public static void AudioEntryType(ViewModel vm)
@@ -358,7 +358,7 @@ public static void AudioEntryType(ViewModel vm)
 
 
         /// <summary>
-        /// FFprobe Cut Duration
+        ///     FFprobe Cut Duration
         /// </summary>
         public static String CutDuration(string input_Text,
                                          bool batch_IsChecked
@@ -386,7 +386,7 @@ bool batch_IsChecked
 
 
         /// <summary>
-        /// FFprobe Input File Info Parse (Method)
+        ///     FFprobe Input File Info Parse (Method)
         /// </summary>
         public static String InputFileInfo(string input_Text, 
                                            bool batch_IsChecked, 
diff --git a/source/Axiom/Axiom/Format/Format.cs b/source/Axiom/Axiom/Format/Format.cs
index 70f147de..8092fdfc 100644
--- a/source/Axiom/Axiom/Format/Format.cs
+++ b/source/Axiom/Axiom/Format/Format.cs
@@ -350,10 +350,10 @@ string frameStart_Text
                 if (string.IsNullOrEmpty(frameStart_Text))
                 {
                     // Start
-                    trimStart = "-ss " + cutStart_Text_Hours.PadLeft(2, '0') + ":" +
-                                         cutStart_Text_Minutes.PadLeft(2, '0') + ":" +
-                                         cutStart_Text_Seconds.PadLeft(2, '0') + "." +
-                                         cutStart_Text_Milliseconds.PadLeft(3, '0');
+                    trimStart = cutStart_Text_Hours.PadLeft(2, '0') + ":" +
+                                cutStart_Text_Minutes.PadLeft(2, '0') + ":" +
+                                cutStart_Text_Seconds.PadLeft(2, '0') + "." +
+                                cutStart_Text_Milliseconds.PadLeft(3, '0');
                 }
 
                 // -------------------------
@@ -363,8 +363,11 @@ string frameStart_Text
                 // use FramesToDecimal Method (Override Time)
                 else if (!string.IsNullOrEmpty(frameStart_Text))
                 {
-                    trimStart = "-ss " + Video.FramesToDecimal(frameStart_Text);
+                    trimStart = Video.FramesToDecimal(frameStart_Text);
                 }
+
+
+                trimStart = "-ss " + trimStart;
             }
 
             // -------------------------
@@ -412,10 +415,22 @@ string frameEnd_Text
                     if (string.IsNullOrEmpty(frameEnd_Text))
                     {
                         // End
-                        trimEnd = "-to " + cutEnd_Text_Hours.PadLeft(2, '0') + ":" +
-                                           cutEnd_Text_Minutes.PadLeft(2, '0') + ":" +
-                                           cutEnd_Text_Seconds.PadLeft(2, '0') + "." +
-                                           cutEnd_Text_Milliseconds.PadLeft(3, '0');
+                        trimEnd = cutEnd_Text_Hours.PadLeft(2, '0') + ":" +
+                                  cutEnd_Text_Minutes.PadLeft(2, '0') + ":" +
+                                  cutEnd_Text_Seconds.PadLeft(2, '0') + "." +
+                                  cutEnd_Text_Milliseconds.PadLeft(3, '0');
+
+                        // If End Time is Empty, Default to Full Duration
+                        // Input Null Check
+                        if (!string.IsNullOrEmpty(input_Text))
+                        {
+                            if (trimEnd == "00:00:00.000" ||
+                                string.IsNullOrEmpty(trimEnd))
+                            {
+                                trimEnd = FFprobe.CutDuration(input_Text, batch_IsChecked);
+                            }
+                        }
+
                     }
 
                     // -------------------------
@@ -425,8 +440,11 @@ string frameEnd_Text
                     // use FramesToDecimal Method (Override Time)
                     else if (!string.IsNullOrEmpty(frameEnd_Text))
                     {
-                        trimEnd = "-to " + Video.FramesToDecimal(frameEnd_Text);
+                        trimEnd = /*"-to " + */Video.FramesToDecimal(frameEnd_Text);
                     }
+
+
+                    trimEnd = "-to " + trimEnd;
                 }
             }
 
diff --git a/source/Axiom/Axiom/Properties/AssemblyInfo.cs b/source/Axiom/Axiom/Properties/AssemblyInfo.cs
index 375183f4..a172509f 100644
--- a/source/Axiom/Axiom/Properties/AssemblyInfo.cs
+++ b/source/Axiom/Axiom/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.7.0")]
-[assembly: AssemblyFileVersion("1.6.7.0")]
+[assembly: AssemblyVersion("1.6.7.1")]
+[assembly: AssemblyFileVersion("1.6.7.1")]