Fix the wrapping issue, for real this time.