Actually fix archiving