move this fixup to where the rest of the fixups are done