Fix naiveserializer