Fixed issue with shadowed self
Almost working zip