initial fixup