more data fixup please!