Fix/embed analysis