fixup after the internal overhaul