Serialization fix for empty data