Hopefully the "right" fix for the zip crash