new version for EmbeddedDocumentField fix