Save state is handled correctly now.