Fixed unpacking archives