Fixed issue #554 (ZIP joins)

Please review...