Patch attached with suggested solution, Please review.