Fixed JSON Serialization