fixup w/ headers