Fixed embedding issue