diff --git a/.install/Bokurano Daibouken 3.sh b/.install/Bokurano Daibouken 3.sh
index 275e8d8..06b8911 100644
--- a/.install/Bokurano Daibouken 3.sh	
+++ b/.install/Bokurano Daibouken 3.sh	
@@ -18,5 +18,10 @@ if [[ "${#dictFile}" -ge 3 ]] && [[ ! -r "${cache}/bk3-dict.dat" ]]; then
 fi
 if [[ -f "${cache}/bk3-dict.dat" ]] ; then
     cp -fv "${cache}/bk3-dict.dat" "${WINEPREFIX}/drive_c/nyanchangame/bk3/dict.dat"
+    if [[ -f "${cache}/nvdaControllerClient32.dll" ]] ; then
+        cp -fv "${cache}/nvdaControllerClient32.dll" "${WINEPREFIX}/drive_c/nyanchangame/bk3/data/nvdaControllerClient32.dll"
+    fi
+else
+    rm -fv "${WINEPREFIX}/drive_c/nyanchangame/bk3/data/nvdaControllerClient32.dll"
 fi
 add_launcher "c:\nyanchangame\bk3\play.exe"
diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index 4c456b7..149b2d5 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -330,12 +330,20 @@ custom_launch_parameters() {
         fi
         if [[ "${game[2]}" == "Bokurano Daibouken 3" ]]; then
             dictPath="$(winepath "${winePath}")"
-            if [[ -r "${cache}/bk3-dict.dat" ]] && [[ ! -d "${dictPath}/dict" ]]; then
-                cp "${cache}/bk3-dict.dat" "${dictPath}/dict.dat"
+            dataDir="${WINEPREFIX}/drive_c/nyanchangame/bk3/data"
+            if [[ -r "${cache}/bk3-dict.dat" ]]; then
+                if [[ ! -d "${dictPath}/dict" ]]; then
+                    cp "${cache}/bk3-dict.dat" "${dictPath}/dict.dat"
+                fi
+                if [[ -r "${cache}/nvdaControllerClient32.dll" ]]; then
+                    cp "${cache}/nvdaControllerClient32.dll" "${dataDir}/nvdaControllerClient32.dll"
+                fi
+            else
+                rm -f "${dataDir}/nvdaControllerClient32.dll"
+                find "${WINEPREFIX}/drive_c/nyanchangame/bk3" -type f -name 'nvdaControllerClient.dll' -exec rm -v "{}" \;
             fi
             # DLL replacement now handled by update_nvda_dlls()
-            if [[ ! -d "${dictPath}/dict" ]] && [[ ! -r "${cache}/bk3-dict.dat" ]]; then
-                find "${WINEPREFIX}/drive_c/nyanchangame/bk3" -type f -name 'nvdaControllerClient.dll' -exec rm -v "{}" \;
+            if [[ ! -d "${dictPath}/dict" ]]; then
                 "${scriptDir}/speech/clipboard_translator.sh" "play.exe" bokurano-daibouken3 &
             fi
         fi
@@ -515,6 +523,9 @@ game_launcher() {
         wine --version
         # kill any previous existing wineservers for this prefix in case they didn't shut down properly.
         wineserver -k
+        # Set default path/exec for custom launch handlers.
+        winePath="${game[1]%\\*.exe}"
+        wineExec="${game[1]##*\\}"
         # launch the game
         if command -v qjoypad &> /dev/null ; then
             mkdir -p ~/.qjoypad3