Saved state works properly now.