Another fixup of dir diagram (2)