fix embedded fields get serialized twice