use original archive and fix patch