JUSTICE FOR #16039 (#16039)