Adjusted makezip behaviour