fixing serialization issue