another fixup attempt