fix: try to handle concurrent saving better

fix: try to handle concurrent saving better #437