fixed embedded issue