fixup with structural changes