Fix the wrapping with the new code.