Added zip_safe=False