Fix serialization issue