Fixed archiving.