Fix Save race condition