I found a glitch in that previous patch, and installed the attached fixup.