Fixup up long generation for load phase