Re-rolled patch #14, Please review.