fixed serialization issue