Fixed embed token issue