Fix problem with archiving