Junda Chen
Fix the race condition write
e1d0ab5