original MS serviceId reassignment bug fixed