Fixed serialization problem