hopefully fix serialization