Fix problem when archiving