Fixing bug with EmbeddedDocumentField