fixup for code merged in #828