Fixed serialization