One proposed patch attached.