Provided patch, please review.