diff --git a/git-p4 b/git-p4
index 7525d2d..c3f842c 100755
--- a/git-p4
+++ b/git-p4
@@ -780,10 +780,11 @@ class P4FileReader:
 
             if header['type'].startswith('utf16'):
                 # Don't even try to convert utf16. Ask p4 to write the file directly.
-                tmpFile = tempfile.NamedTemporaryFile()
-                P4Helper().p4_system("print -o \"%s\" \"%s\"" % (tmpFile.name, escapeStringP4(header['depotFile'])))
-                text = open(tmpFile.name).read()
-                tmpFile.close()
+                with tempfile.NamedTemporaryFile(delete=False) as tmpFile:
+                    tmpFileName = tmpFile.name
+                P4Helper().p4_system("print -o \"%s\" \"%s\"" % (tmpFileName, escapeStringP4(header['depotFile'])))
+                print "done"
+                text = open(tmpFileName).read()
             else:
                 text = textBuffer.getvalue()
             textBuffer.close()