Fix embedding problem