diff --git a/lib/util/fix-owner.js b/lib/util/fix-owner.js
index 9a60711..c7b1300 100644
--- a/lib/util/fix-owner.js
+++ b/lib/util/fix-owner.js
@@ -37,5 +37,8 @@ function mkdirfix (p, uid, gid, cb) {
     if (made) {
       return fixOwner(made, uid, gid).then(() => made)
     }
+  }).catch({code: 'EEXIST'}, () => {
+    // There's a race in mkdirp!
+    return fixOwner(p, uid, gid).then(() => null)
   })
 }