Embedding bug fixed