serialized version
fix conflict