fix most serializtion problem