ROO-3546: Solving problems when not exists embeddable fields