try to remove race conditions in build