fix Serialization issue