diff --git a/HISTORY.txt b/HISTORY.txt
index 5776755..0f62f5f 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -2,6 +2,10 @@
 Simple x264/x265 Launcher version history 
 ----------------------------------------- 
 
+Version 2.65 [2015-??-??]
+* Added menu entry to remove all completed or enqueued jobs at once
+* Improved 32-Bit vs. 64-Bit selection for Avisynth/VapourSynth
+
 Version 2.64 [2015-12-20]
 * Fixed a dependency issue with Visual Studio runtime libraries
 
diff --git a/src/source_avisynth.h b/src/source_avisynth.h
index 9adc5a5..8e92529 100644
--- a/src/source_avisynth.h
+++ b/src/source_avisynth.h
@@ -49,6 +49,6 @@ protected:
 	virtual void checkSourceProperties_init(QList<QRegExp*> &patterns, QStringList &cmdLine);
 	virtual void checkSourceProperties_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &frames, unsigned int &fSizeW, unsigned int &fSizeH, unsigned int &fpsNom, unsigned int &fpsDen);
 
-	virtual QString getBinaryPath() const { return getSourceInfo().getBinaryPath(m_sysinfo, (m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64) && m_preferences->getPrefer64BitSource())); }
+	virtual QString getBinaryPath() const { return getSourceInfo().getBinaryPath(m_sysinfo, m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64) && m_sysinfo->getAvisynth(SysinfoModel::Avisynth_X64) && (m_preferences->getPrefer64BitSource() || (!m_sysinfo->getAvisynth(SysinfoModel::Avisynth_X86)))); }
 	virtual void buildCommandLine(QStringList &cmdLine);
 };
diff --git a/src/source_vapoursynth.h b/src/source_vapoursynth.h
index 354dee2..3a2481e 100644
--- a/src/source_vapoursynth.h
+++ b/src/source_vapoursynth.h
@@ -48,6 +48,6 @@ protected:
 	virtual void checkSourceProperties_init(QList<QRegExp*> &patterns, QStringList &cmdLine);
 	virtual void checkSourceProperties_parseLine(const QString &line, QList<QRegExp*> &patterns, unsigned int &frames, unsigned int &fSizeW, unsigned int &fSizeH, unsigned int &fpsNom, unsigned int &fpsDen);
 
-	virtual QString getBinaryPath() const { return getSourceInfo().getBinaryPath(m_sysinfo, (m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64) && m_preferences->getPrefer64BitSource())); }
+	virtual QString getBinaryPath() const { return getSourceInfo().getBinaryPath(m_sysinfo, m_sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64) && m_sysinfo->getVapourSynth(SysinfoModel::VapourSynth_X64) && (m_preferences->getPrefer64BitSource() || (!m_sysinfo->getVapourSynth(SysinfoModel::VapourSynth_X86)))); }
 	virtual void buildCommandLine(QStringList &cmdLine);
 };
diff --git a/src/version.h b/src/version.h
index b42a331..701776b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 6
 #define VER_X264_PATCH 5
-#define VER_X264_BUILD 1004
+#define VER_X264_BUILD 1006
 
 #define VER_X264_PORTABLE_EDITION (0)