Fixed Serialization issue