Patch attached. Please review.