even more fixup