fixed embedded entities