diff --git a/BrawlBuilder/BrawlBuilder.WorkerCode.cs b/BrawlBuilder/BrawlBuilder.WorkerCode.cs
index 0dcd84e..1c67569 100644
--- a/BrawlBuilder/BrawlBuilder.WorkerCode.cs
+++ b/BrawlBuilder/BrawlBuilder.WorkerCode.cs
@@ -15,6 +15,12 @@ namespace BrawlBuilder
 {
 	partial class BrawlBuilder
 	{
+		private bool _remove_en;
+		private bool _showWit;
+		private State _state;
+
+		private static string _basePath = Path.GetDirectoryName(Application.ExecutablePath);
+
 		private enum State
 		{
 			Analyze,
@@ -57,12 +63,6 @@ namespace BrawlBuilder
 			{"stgfamicom", "st_famicom"},       /* Mario Bros.       */
 		};
 
-		private bool _remove_en;
-		private bool _showWit;
-		private State _state;
-
-		private static string _basePath = Path.GetDirectoryName(Application.ExecutablePath);
-
 		private void buildWorker_DoWork(object sender, DoWorkEventArgs e)
 		{
 			// Don't remove the _en suffix by default
diff --git a/BrawlBuilder/Program.cs b/BrawlBuilder/Program.cs
index a2170b6..d200399 100644
--- a/BrawlBuilder/Program.cs
+++ b/BrawlBuilder/Program.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Windows.Forms;
 using System.Reflection;
+using System.IO;
 
 namespace BrawlBuilder
 {
 	static class Program
 	{
-		private const string DllDir = @"Resources\";
+		private static string DllDir = Path.GetDirectoryName(Application.ExecutablePath) + @"\Resources\";
 
 		/// <summary>
 		/// The main entry point for the application.
diff --git a/BrawlBuilder/Properties/AssemblyInfo.cs b/BrawlBuilder/Properties/AssemblyInfo.cs
index e3121b2..81ffbaa 100644
--- a/BrawlBuilder/Properties/AssemblyInfo.cs
+++ b/BrawlBuilder/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.2.2.0")]
+[assembly: AssemblyFileVersion("1.2.2.0")]
diff --git a/Other/readme.txt b/Other/readme.txt
index 9ad3a71..8e81552 100644
--- a/Other/readme.txt
+++ b/Other/readme.txt
@@ -1,5 +1,5 @@
 ------------------------------------/
-------- BRAWLBUILDER v1.2.1 -------/
+------- BRAWLBUILDER v1.2.2 -------/
 ----------------------------------/
 
 "The Ultimate Super Smash Bros. Brawl ISO Builder"
@@ -85,6 +85,9 @@ if it doesn't, just copy it manually.
 --------------------/
 ------ Changelog --/
 ------------------/
+1.2.2:
+ - Fix custom working directories not working (again)
+
 1.2.1:
  - Remove the BrawlBuilder.exe.config file
  - Fix 'Custom banner' browse button appearance for certain Windows versions/themes