Index: lib/xvfs/xvfs.tcl
==================================================================
--- lib/xvfs/xvfs.tcl
+++ lib/xvfs/xvfs.tcl
@@ -146,11 +146,11 @@
 		if {$file in {. ..}} {
 			continue
 		}
 
 		set inputFile [file join $workingDirectory $file]
-		set outputFile [file join $outputDirectory $file]
+		set outputFile [file join $outputDirectory [encoding convertto utf-8 $file]]
 
 		unset -nocomplain fileInfo
 		catch {
 			file lstat $inputFile fileInfo
 		}

Index: xvfs.c.rvt
==================================================================
--- xvfs.c.rvt
+++ xvfs.c.rvt
@@ -51,11 +51,10 @@
 	foreach {outputFileHash outputFileIndexes} [lsort -stride 2 -dictionary [array get outputFileHashToIndex]] {
 ?>		case <?= $outputFileHash ?>:
 <?
 			foreach outputFileIndex $outputFileIndexes {
 				set outputFileName [lindex $::xvfs::outputFiles $outputFileIndex]
-				set outputFileName [encoding convertto utf-8 $outputFileName]
 				set outputFileNameLen [string length $outputFileName]
 ?>			if (pathLen == <?= $outputFileNameLen ?> && memcmp(path, xvfs_<?= $::xvfs::fsName ?>_data[<?= $outputFileIndex ?>].name, pathLen) == 0) {
 				return(<?= $outputFileIndex ?>);
 			}
 <?