Text changes, state restoration fix.