Move deferred resolution on end to unzip stream to prevent premature ending