Cleared State is now saved properly