BUG: fixups for jan 1998 dd