diff --git a/BizHawk.MultiClient/movie/MovieMnemonics.cs b/BizHawk.MultiClient/movie/MovieMnemonics.cs
index 3bda263eb1..032450fae7 100644
--- a/BizHawk.MultiClient/movie/MovieMnemonics.cs
+++ b/BizHawk.MultiClient/movie/MovieMnemonics.cs
@@ -786,7 +786,7 @@ namespace BizHawk.MultiClient
 
 			for (int player = 1; player <= MnemonicConstants.PLAYERS[ControlType]; player++)
 			{
-				int srcindex = (player - 1) * (MnemonicConstants.BUTTONS[ControlType].Count + MnemonicConstants.ANALOGS[ControlType].Count * 4 + 1);
+				int srcindex = (player - 1) * (MnemonicConstants.BUTTONS[ControlType].Count + MnemonicConstants.ANALOGS[ControlType].Count * 4 + 1 + 1);
 
 				if (mnemonic.Length < srcindex + 3 + MnemonicConstants.BUTTONS[ControlType].Count - 1)
 				{
diff --git a/BizHawk.Util/InputValidate.cs b/BizHawk.Util/InputValidate.cs
index 1f70041eb3..8d960e8f4e 100644
--- a/BizHawk.Util/InputValidate.cs
+++ b/BizHawk.Util/InputValidate.cs
@@ -39,7 +39,7 @@ namespace BizHawk
 		/// <returns></returns>
 		public static bool IsValidSignedNumber(string Str)
 		{
-			char[] input = (Str.ToCharArray());
+			char[] input = (Str.Trim().ToCharArray());
 			ASCIIEncoding AE = new ASCIIEncoding();
 			// Check each character in the new label to determine if it is a number.
 			for (int x = 0; x < input.Length; x++)