Should fix empty archive problem