Fixed serialization and fixing