Fixed endless loop after archive ends