Fixed archiving bug