Binary serialization class fix