... dir fixup again