Fix Serialization

Fix Serialization