Resolve #20 - Fixed archiving issue.