Fixed save (and-replace) following loading a previously saved state