Fix emergency saving