Fixed Zip issue with infinite streams.

Issue #539