fix serialization again