Resolve race condition in make_path