Fixed an error with unserialize, invalidate will further cleanup.