internal is no longer a singleton
fixup establishes
fixup internal is no longer