fix double saves