Fix a Serialization BUG