diff --git a/README.md b/README.md
index 139cf7e..1d7678b 100644
--- a/README.md
+++ b/README.md
@@ -458,6 +458,7 @@ As you see, z.lua is the fastest one and requires less resource.
 
 ## History
 
+- 1.5.10 (2019-03-01): Prevent writing file racing.
 - 1.5.9 (2019-02-25): `z -b` should not match current directory (close #56).
 - 1.5.8 (2019-02-21): new `$_ZL_FZF_HEIGHT` to control `--height` parameter in fzf.
 - 1.5.7 (2019-02-21): rename `$_ZL_FZF_SORT` to `$_ZL_INT_SORT` it will affect both `-i` and `-I`.
diff --git a/z.lua b/z.lua
index 150beec..5499a3e 100755
--- a/z.lua
+++ b/z.lua
@@ -4,7 +4,7 @@
 -- z.lua - a cd command that learns, by skywind 2018, 2019
 -- Licensed under MIT license.
 --
--- Version 1.5.9, Last Modified: 2019/02/25 23:17
+-- Version 1.5.10, Last Modified: 2019/03/01 13:08
 --
 -- * 10x faster than fasd and autojump, 3x faster than z.sh
 -- * available for posix shells: bash, zsh, sh, ash, dash, busybox
@@ -960,11 +960,16 @@ function data_save(filename, M)
 		fp = io.open(filename, 'w')
 	else
 		math.random_init()
-		tmpname = filename .. '.' .. tostring(os.time())
-		tmpname = tmpname .. math.random_string(8)
-		local rnd = os.getenv('_ZL_RANDOM')
-		tmpname = tmpname .. '' .. (rnd and rnd or '')
-		-- print('tmpname: '..tmpname)
+		while true do
+			tmpname = filename .. '.' .. tostring(os.time())
+			tmpname = tmpname .. math.random_string(8)
+			local rnd = os.getenv('_ZL_RANDOM')
+			tmpname = tmpname .. '' .. (rnd and rnd or '')
+			if not os.path.exists(tmpname) then
+				-- print('tmpname: '..tmpname)
+				break
+			end
+		end
 		fp = io.open(tmpname, 'w')
 	end
 	if fp == nil then