fix optimized serialization strategy