fix: better handle concurrent builds

fix: better handle concurrent builds #989