Preventing craching on fast save