Fix serialization problem