fix Embeddables combined with ElementCollections