fixed name + zip_safe=False