appId fix part 2