Fix CB serialization