fix (or at least work around) #788