fixed serialization