Fixing the preserved state issues.