Fixed Serialization failure