Fixed issue #554 (ZIP joins)
Merge pull request #708 from Radsaggi/tmp/issue554

Fixed issue #554 (ZIP joins)