Fixed bug: remember changes to the initial state