Fixed serialization.