Fix JDF-761, part 2