Re-rolled patch #82, Please review.