Fixed serialization, not backwards compatible