Fixed $embedpath part 2