Patch attached for same, please review.