Kludge to fix "empty witness" error

Correction is in tokenize rich