Bug fix for archiving.