fix serialization issue