Serialization fix for web clients