I was hoping a patch could be avoided. Let me see if I can patch it.