some other fixup ..